virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avformat/gxfenc: Added support for writing correct auxiliary data for DV streams.

Browse Source 
Different aux data is written for DVCAM and DVPRO formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Reuben Martin 2013-06-12 23:17:21 -05:00 committed by Michael Niedermayer
parent de0a1f63df
commit 4a60df2d35
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libavformat/gxfenc.c
View File

@ -217,12 +217,27 @@ static int gxf_write_mpeg_auxiliary(AVIOContext *pb, AVStream *st)
return size + 3; return size + 3;
} }
static int gxf_write_dv_auxiliary(AVIOContext *pb, AVStream *st)
{
int64_t track_aux_data = 0;
avio_w8(pb, TRACK_AUX);
avio_w8(pb, 8);
if (st->codec->pix_fmt == PIX_FMT_YUV420P)
track_aux_data |= 0x01; /* marks stream as DVCAM instead of DVPRO */
track_aux_data |= 0x40000000; /* aux data is valid */
avio_wl64(pb, track_aux_data);
return 8;
}
static int gxf_write_timecode_auxiliary(AVIOContext *pb, GXFContext *gxf) static int gxf_write_timecode_auxiliary(AVIOContext *pb, GXFContext *gxf)
{ {
uint32_t timecode = GXF_TIMECODE(gxf->tc.color, gxf->tc.drop, uint32_t timecode = GXF_TIMECODE(gxf->tc.color, gxf->tc.drop,
gxf->tc.hh, gxf->tc.mm, gxf->tc.hh, gxf->tc.mm,
gxf->tc.ss, gxf->tc.ff); gxf->tc.ss, gxf->tc.ff);
avio_w8(pb, TRACK_AUX);
avio_w8(pb, 8);
avio_wl32(pb, timecode); avio_wl32(pb, timecode);
/* reserved */ /* reserved */
avio_wl32(pb, 0); avio_wl32(pb, 0);
@ -234,7 +249,6 @@ static int gxf_write_track_description(AVFormatContext *s, GXFStreamContext *sc,
GXFContext *gxf = s->priv_data; GXFContext *gxf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int64_t pos; int64_t pos;
int mpeg = sc->track_type == 4 || sc->track_type == 9;
/* track description section */ /* track description section */
avio_w8(pb, sc->media_type + 0x80); avio_w8(pb, sc->media_type + 0x80);
@ -250,13 +264,21 @@ static int gxf_write_track_description(AVFormatContext *s, GXFStreamContext *sc,
avio_wb16(pb, sc->media_info); avio_wb16(pb, sc->media_info);
avio_w8(pb, 0); avio_w8(pb, 0);
if (!mpeg) { switch (sc->track_type) {
/* auxiliary information */ case 3: /* timecode */
avio_w8(pb, TRACK_AUX);
avio_w8(pb, 8);
if (sc->track_type == 3)
gxf_write_timecode_auxiliary(pb, gxf); gxf_write_timecode_auxiliary(pb, gxf);
else break;
case 4: /* MPEG2 */
case 9: /* MPEG1 */
gxf_write_mpeg_auxiliary(pb, s->streams[index]);
break;
case 5: /* DV25 */
case 6: /* DV50 */
gxf_write_dv_auxiliary(pb, s->streams[index]);
break;
default:
avio_w8(pb, TRACK_AUX);
avio_w8(pb, 8);
avio_wl64(pb, 0); avio_wl64(pb, 0);
} }
@ -265,9 +287,6 @@ static int gxf_write_track_description(AVFormatContext *s, GXFStreamContext *sc,
avio_w8(pb, 4); avio_w8(pb, 4);
avio_wb32(pb, 0); avio_wb32(pb, 0);
if (mpeg)
gxf_write_mpeg_auxiliary(pb, s->streams[index]);
/* frame rate */ /* frame rate */
avio_w8(pb, TRACK_FPS); avio_w8(pb, TRACK_FPS);
avio_w8(pb, 4); avio_w8(pb, 4);
@ -534,13 +553,20 @@ static int gxf_write_umf_media_timecode(AVIOContext *pb, int drop)
return 32; return 32;
} }
static int gxf_write_umf_media_dv(AVIOContext *pb, GXFStreamContext *sc) static int gxf_write_umf_media_dv(AVIOContext *pb, GXFStreamContext *sc, AVStream *st)
{ {
int i; int dv_umf_data = 0;
for (i = 0; i < 8; i++) { if (st->codec->pix_fmt == PIX_FMT_YUV420P)
avio_wb32(pb, 0); dv_umf_data |= 0x20; /* marks as DVCAM instead of DVPRO */
} avio_wl32(pb, dv_umf_data);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
return 32; return 32;
} }
@ -604,7 +630,7 @@ static int gxf_write_umf_media_description(AVFormatContext *s)
gxf_write_umf_media_audio(pb, sc); gxf_write_umf_media_audio(pb, sc);
break; break;
case AV_CODEC_ID_DVVIDEO: case AV_CODEC_ID_DVVIDEO:
gxf_write_umf_media_dv(pb, sc); gxf_write_umf_media_dv(pb, sc, st);
break; break;
} }
} }

6
tests/ref/lavf/gxf
View File

@ -1,9 +1,9 @@
c8b3a8e3ba0185ce39122ac150c12bc3 *./tests/data/lavf/lavf.gxf a9672bb2a5b7927bf362f76bcce9bdf7 *./tests/data/lavf/lavf.gxf
795876 ./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0x147ff044 ./tests/data/lavf/lavf.gxf CRC=0x147ff044
b26bd3cb439dff8b33cd74a27a3fc2d6 *./tests/data/lavf/lavf.gxf 2138952377f92d9c3a036f576197dbd7 *./tests/data/lavf/lavf.gxf
794656 ./tests/data/lavf/lavf.gxf 794656 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0xe0199511 ./tests/data/lavf/lavf.gxf CRC=0xe0199511
e4721383461d7a9feae41435567c9257 *./tests/data/lavf/lavf.gxf f89a6b3e8a2c88eacafef7e283e6418b *./tests/data/lavf/lavf.gxf
795876 ./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0xd9d58865 ./tests/data/lavf/lavf.gxf CRC=0xd9d58865