virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

cosmetics, rename nb_frames to nb_fields

Browse Source 
Originally committed as revision 17213 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-13 21:32:18 +00:00
parent ab91e84d2b
commit 032d8aece2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/gxfenc.c
View File

@ -50,7 +50,7 @@ typedef struct GXFStreamContext {
} GXFStreamContext; } GXFStreamContext;
typedef struct GXFContext { typedef struct GXFContext {
uint32_t nb_frames; uint32_t nb_fields;
uint32_t material_flags; uint32_t material_flags;
uint16_t audio_tracks; uint16_t audio_tracks;
uint16_t mpeg_tracks; uint16_t mpeg_tracks;
@ -296,7 +296,7 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx)
/* last field */ /* last field */
put_byte(pb, MAT_LAST_FIELD); put_byte(pb, MAT_LAST_FIELD);
put_byte(pb, 4); put_byte(pb, 4);
put_be32(pb, ctx->nb_frames); put_be32(pb, ctx->nb_fields);
/* reserved */ /* reserved */
put_byte(pb, MAT_MARK_IN); put_byte(pb, MAT_MARK_IN);
@ -305,7 +305,7 @@ static int gxf_write_material_data_section(ByteIOContext *pb, GXFContext *ctx)
put_byte(pb, MAT_MARK_OUT); put_byte(pb, MAT_MARK_OUT);
put_byte(pb, 4); put_byte(pb, 4);
put_be32(pb, ctx->nb_frames); put_be32(pb, ctx->nb_fields);
/* estimated size */ /* estimated size */
put_byte(pb, MAT_SIZE); put_byte(pb, MAT_SIZE);
@ -365,16 +365,16 @@ static int gxf_write_umf_material_description(ByteIOContext *pb, GXFContext *ctx
{ {
// XXX drop frame // XXX drop frame
uint32_t timecode = uint32_t timecode =
ctx->nb_frames / (ctx->sample_rate * 3600) % 24 << 24 | // hours ctx->nb_fields / (ctx->sample_rate * 3600) % 24 << 24 | // hours
ctx->nb_frames / (ctx->sample_rate * 60) % 60 << 16 | // minutes ctx->nb_fields / (ctx->sample_rate * 60) % 60 << 16 | // minutes
ctx->nb_frames / ctx->sample_rate % 60 << 8 | // seconds ctx->nb_fields / ctx->sample_rate % 60 << 8 | // seconds
ctx->nb_frames % ctx->sample_rate; // fields ctx->nb_fields % ctx->sample_rate; // fields
put_le32(pb, ctx->flags); put_le32(pb, ctx->flags);
put_le32(pb, ctx->nb_frames); /* length of the longest track */ put_le32(pb, ctx->nb_fields); /* length of the longest track */
put_le32(pb, ctx->nb_frames); /* length of the shortest track */ put_le32(pb, ctx->nb_fields); /* length of the shortest track */
put_le32(pb, 0); /* mark in */ put_le32(pb, 0); /* mark in */
put_le32(pb, ctx->nb_frames); /* mark out */ put_le32(pb, ctx->nb_fields); /* mark out */
put_le32(pb, 0); /* timecode mark in */ put_le32(pb, 0); /* timecode mark in */
put_le32(pb, timecode); /* timecode mark out */ put_le32(pb, timecode); /* timecode mark out */
put_le64(pb, ctx->fc->timestamp); /* modification time */ put_le64(pb, ctx->fc->timestamp); /* modification time */
@ -520,10 +520,10 @@ static int gxf_write_umf_media_description(ByteIOContext *pb, GXFContext *ctx)
put_le16(pb, sc->media_info); put_le16(pb, sc->media_info);
put_le16(pb, 0); /* reserved */ put_le16(pb, 0); /* reserved */
put_le16(pb, 0); /* reserved */ put_le16(pb, 0); /* reserved */
put_le32(pb, ctx->nb_frames); put_le32(pb, ctx->nb_fields);
put_le32(pb, 0); /* attributes rw, ro */ put_le32(pb, 0); /* attributes rw, ro */
put_le32(pb, 0); /* mark in */ put_le32(pb, 0); /* mark in */
put_le32(pb, ctx->nb_frames); /* mark out */ put_le32(pb, ctx->nb_fields); /* mark out */
strncpy(buffer, ES_NAME_PATTERN, path_size); strncpy(buffer, ES_NAME_PATTERN, path_size);
put_buffer(pb, (uint8_t *)buffer, path_size); put_buffer(pb, (uint8_t *)buffer, path_size);
put_be16(pb, sc->media_info); put_be16(pb, sc->media_info);
@ -776,7 +776,7 @@ static int gxf_write_media_packet(ByteIOContext *pb, GXFContext *ctx, AVPacket *
gxf_write_padding(pb, padding); gxf_write_padding(pb, padding);
if (sc->codec->codec_type == CODEC_TYPE_VIDEO) if (sc->codec->codec_type == CODEC_TYPE_VIDEO)
ctx->nb_frames += 2; // count fields ctx->nb_fields += 2; // count fields
return updatePacketSize(pb, pos); return updatePacketSize(pb, pos);
} }