Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
48c06386
Commit
48c06386
authored
Oct 14, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dpx: Replace avpicture functions with imgutils
Signed-off-by:
Vittorio Giovara
<
vittorio.giovara@gmail.com
>
parent
f0a10657
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
dpxenc.c
libavcodec/dpxenc.c
+9
-6
No files found.
libavcodec/dpxenc.c
View file @
48c06386
...
...
@@ -78,7 +78,7 @@ do { \
else AV_WL32(p, value); \
} while(0)
static
void
encode_rgb48_10bit
(
AVCodecContext
*
avctx
,
const
AV
Pictur
e
*
pic
,
static
void
encode_rgb48_10bit
(
AVCodecContext
*
avctx
,
const
AV
Fram
e
*
pic
,
uint8_t
*
dst
)
{
DPXContext
*
s
=
avctx
->
priv_data
;
...
...
@@ -115,7 +115,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if
(
s
->
bits_per_component
==
10
)
size
=
avctx
->
height
*
avctx
->
width
*
4
;
else
size
=
avpicture_get_size
(
avctx
->
pix_fmt
,
avctx
->
width
,
avctx
->
height
);
size
=
av_image_get_buffer_size
(
avctx
->
pix_fmt
,
avctx
->
width
,
avctx
->
height
,
1
);
if
((
ret
=
ff_alloc_packet
(
pkt
,
size
+
HEADER_SIZE
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error getting output packet.
\n
"
);
return
ret
;
...
...
@@ -153,14 +154,16 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
switch
(
s
->
bits_per_component
)
{
case
8
:
case
16
:
size
=
avpicture_layout
((
const
AVPicture
*
)
frame
,
avctx
->
pix_fmt
,
avctx
->
width
,
avctx
->
height
,
buf
+
HEADER_SIZE
,
pkt
->
size
-
HEADER_SIZE
);
size
=
av_image_copy_to_buffer
(
buf
+
HEADER_SIZE
,
pkt
->
size
-
HEADER_SIZE
,
frame
->
data
,
frame
->
linesize
,
avctx
->
pix_fmt
,
avctx
->
width
,
avctx
->
height
,
1
);
if
(
size
<
0
)
return
size
;
break
;
case
10
:
encode_rgb48_10bit
(
avctx
,
(
const
AVPicture
*
)
frame
,
buf
+
HEADER_SIZE
);
encode_rgb48_10bit
(
avctx
,
frame
,
buf
+
HEADER_SIZE
);
break
;
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unsupported bit depth: %d
\n
"
,
s
->
bits_per_component
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment