[FFmpeg-cvslog] avformat/movenc: correct ImageDescription for uncompressed ycbcr
Dave Rice
git at videolan.org
Mon Nov 20 03:53:04 EET 2017
ffmpeg | branch: master | Dave Rice <dave at dericed.com> | Sat Nov 18 21:19:17 2017 -0500| [1e5f9234166408daf536407117499d3affa34234] | committer: Michael Niedermayer
avformat/movenc: correct ImageDescription for uncompressed ycbcr
Per
https://developer.apple.com/library/content/technotes/tn2162/_index.html
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e5f9234166408daf536407117499d3affa34234
---
libavformat/movenc.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 01ae467fa1..152fdb46c2 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1832,6 +1832,13 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr
char compressor_name[32] = { 0 };
int avid = 0;
+ int uncompressed_ycbcr = ((track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVY422)
+ || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422)
+ || track->par->codec_id == AV_CODEC_ID_V308
+ || track->par->codec_id == AV_CODEC_ID_V408
+ || track->par->codec_id == AV_CODEC_ID_V410
+ || track->par->codec_id == AV_CODEC_ID_V210);
+
avio_wb32(pb, 0); /* size */
if (mov->encryption_scheme != MOV_ENC_NONE) {
ffio_wfourcc(pb, "encv");
@@ -1842,11 +1849,15 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr
avio_wb16(pb, 0); /* Reserved */
avio_wb16(pb, 1); /* Data-reference index */
- avio_wb16(pb, 0); /* Codec stream version */
+ if (uncompressed_ycbcr) {
+ avio_wb16(pb, 2); /* Codec stream version */
+ } else {
+ avio_wb16(pb, 0); /* Codec stream version */
+ }
avio_wb16(pb, 0); /* Codec stream revision (=0) */
if (track->mode == MODE_MOV) {
ffio_wfourcc(pb, "FFMP"); /* Vendor */
- if (track->par->codec_id == AV_CODEC_ID_RAWVIDEO) {
+ if (track->par->codec_id == AV_CODEC_ID_RAWVIDEO || uncompressed_ycbcr) {
avio_wb32(pb, 0); /* Temporal Quality */
avio_wb32(pb, 0x400); /* Spatial Quality = lossless*/
} else {
@@ -1870,7 +1881,10 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr
avio_w8(pb, strlen(compressor_name));
avio_write(pb, compressor_name, 31);
- if (track->mode == MODE_MOV && track->par->bits_per_coded_sample)
+ if (track->mode == MODE_MOV &&
+ (track->par->codec_id == AV_CODEC_ID_V410 || track->par->codec_id == AV_CODEC_ID_V210))
+ avio_wb16(pb, 0x18);
+ else if (track->mode == MODE_MOV && track->par->bits_per_coded_sample)
avio_wb16(pb, track->par->bits_per_coded_sample |
(track->par->format == AV_PIX_FMT_GRAY8 ? 0x20 : 0));
else
More information about the ffmpeg-cvslog
mailing list