[FFmpeg-cvslog] r16904 - trunk/libavformat/gxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat Jan 31 12:06:20 2009
New Revision: 16904

Log:
use st->priv_data to store per stream context

Modified:
   trunk/libavformat/gxfenc.c

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Sat Jan 31 11:51:35 2009	(r16903)
+++ trunk/libavformat/gxfenc.c	Sat Jan 31 12:06:20 2009	(r16904)
@@ -66,7 +66,6 @@ typedef struct GXFContext {
     int sample_rate;
     int flags;
     AVFormatContext *fc;
-    GXFStreamContext streams[48];
 } GXFContext;
 
 typedef struct GXF_Lines {
@@ -320,7 +319,7 @@ static int gxf_write_track_description_s
     pos = url_ftell(pb);
     put_be16(pb, 0); /* size */
     for (i = 0; i < ctx->fc->nb_streams; ++i)
-        gxf_write_track_description(pb, &ctx->streams[i]);
+        gxf_write_track_description(pb, ctx->fc->streams[i]->priv_data);
     return updateSize(pb, pos);
 }
 
@@ -411,7 +410,7 @@ static int gxf_write_umf_track_descripti
     ctx->umf_track_offset = pos - ctx->umf_start_offset;
     for (i = 0; i < ctx->fc->nb_streams; ++i) {
         AVStream *st = ctx->fc->streams[i];
-        GXFStreamContext *sc = &ctx->streams[i];
+        GXFStreamContext *sc = st->priv_data;
         int id = 0;
 
         switch (st->codec->codec_id) {
@@ -506,7 +505,7 @@ static int gxf_write_umf_media_descripti
     pos = url_ftell(pb);
     ctx->umf_media_offset = pos - ctx->umf_start_offset;
     for (i = 0; i < ctx->fc->nb_streams; ++i) {
-        GXFStreamContext *sc = &ctx->streams[i];
+        GXFStreamContext *sc = ctx->fc->streams[i]->priv_data;
         char buffer[88];
         int64_t startpos, curpos;
         int path_size = strlen(ES_NAME_PATTERN);
@@ -598,7 +597,10 @@ static int gxf_write_header(AVFormatCont
     gxf->flags |= 0x00080000; /* material is simple clip */
     for (i = 0; i < s->nb_streams; ++i) {
         AVStream *st = s->streams[i];
-        GXFStreamContext *sc = &gxf->streams[i];
+        GXFStreamContext *sc = av_mallocz(sizeof(*sc));
+        if (!sc)
+            return AVERROR(ENOMEM);
+        st->priv_data = sc;
 
         sc->codec = st->codec;
         sc->index = i;
@@ -691,8 +693,9 @@ static int gxf_write_trailer(AVFormatCon
     int i;
 
     for (i = 0; i < s->nb_streams; ++i) {
-        if (s->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-            av_fifo_free(&gxf->streams[i].audio_buffer);
+        AVStream *st = s->streams[i];
+        if (st->codec->codec_type == CODEC_TYPE_AUDIO)
+            av_fifo_free(&((GXFStreamContext*)st->priv_data)->audio_buffer);
     }
 
     gxf_write_eos_packet(pb, gxf);
@@ -720,7 +723,7 @@ static int gxf_parse_mpeg_frame(GXFStrea
 
 static int gxf_write_media_preamble(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt, int size)
 {
-    GXFStreamContext *sc = &ctx->streams[pkt->stream_index];
+    GXFStreamContext *sc = ctx->fc->streams[pkt->stream_index]->priv_data;
     int64_t dts = av_rescale_rnd(pkt->dts, ctx->sample_rate, sc->codec->time_base.den, AV_ROUND_UP);
 
     put_byte(pb, sc->media_type);
@@ -755,7 +758,7 @@ static int gxf_write_media_preamble(Byte
 
 static int gxf_write_media_packet(ByteIOContext *pb, GXFContext *ctx, AVPacket *pkt)
 {
-    GXFStreamContext *sc = &ctx->streams[pkt->stream_index];
+    GXFStreamContext *sc = ctx->fc->streams[pkt->stream_index]->priv_data;
     int64_t pos = url_ftell(pb);
     int padding = 0;
 
@@ -805,7 +808,7 @@ static int gxf_interleave_packet(AVForma
 
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
-        GXFStreamContext *sc = &gxf->streams[i];
+        GXFStreamContext *sc = st->priv_data;
         if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
             if (pkt && pkt->stream_index == i) {
                 av_fifo_generic_write(&sc->audio_buffer, pkt->data, pkt->size, NULL);