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
99214d42
Commit
99214d42
authored
Feb 08, 2016
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnxhd: Make the encoder message friendlier
parent
34c9eba9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
dnxhddata.c
libavcodec/dnxhddata.c
+23
-0
dnxhddata.h
libavcodec/dnxhddata.h
+1
-0
dnxhdenc.c
libavcodec/dnxhdenc.c
+3
-2
No files found.
libavcodec/dnxhddata.c
View file @
99214d42
...
...
@@ -1203,3 +1203,26 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth)
}
return
0
;
}
void
ff_dnxhd_list_cid
(
AVCodecContext
*
avctx
)
{
int
i
,
j
;
for
(
i
=
0
;
i
<
FF_ARRAY_ELEMS
(
ff_dnxhd_cid_table
);
i
++
)
{
const
CIDEntry
*
cid
=
&
ff_dnxhd_cid_table
[
i
];
av_log
(
avctx
,
AV_LOG_INFO
,
"cid %d %ux%u %dbits %s bit rates"
,
cid
->
cid
,
cid
->
width
,
cid
->
height
,
cid
->
bit_depth
,
cid
->
interlaced
?
"interlaced "
:
"progressive"
);
for
(
j
=
0
;
j
<
FF_ARRAY_ELEMS
(
cid
->
bit_rates
);
j
++
)
{
if
(
!
cid
->
bit_rates
[
j
])
break
;
av_log
(
avctx
,
AV_LOG_INFO
,
" %dM"
,
cid
->
bit_rates
[
j
]);
}
av_log
(
avctx
,
AV_LOG_INFO
,
"
\n
"
);
}
}
libavcodec/dnxhddata.h
View file @
99214d42
...
...
@@ -47,5 +47,6 @@ extern const CIDEntry ff_dnxhd_cid_table[];
int
ff_dnxhd_get_cid_table
(
int
cid
);
int
ff_dnxhd_find_cid
(
AVCodecContext
*
avctx
,
int
bit_depth
);
void
ff_dnxhd_list_cid
(
AVCodecContext
*
avctx
);
#endif
/* AVCODEC_DNXHDDATA_H */
libavcodec/dnxhdenc.c
View file @
99214d42
...
...
@@ -289,14 +289,15 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
break
;
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"
pixel format is incompatible with DNxHD
\n
"
);
"
Pixel format is incompatible with DNxHD, use yuv422p or yuv422p10.
\n
"
);
return
AVERROR
(
EINVAL
);
}
ctx
->
cid
=
ff_dnxhd_find_cid
(
avctx
,
bit_depth
);
if
(
!
ctx
->
cid
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"video parameters incompatible with DNxHD
\n
"
);
"Video parameters incompatible with DNxHD, available CIDs:
\n
"
);
ff_dnxhd_list_cid
(
avctx
);
return
AVERROR
(
EINVAL
);
}
av_log
(
avctx
,
AV_LOG_DEBUG
,
"cid %d
\n
"
,
ctx
->
cid
);
...
...
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