March 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2014 - dvbmuxer/mpegpesenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 18:16:52 2008 New Revision: 2014 Log: cosmetics Modified: dvbmuxer/mpegpesenc.c Modified: dvbmuxer/mpegpesenc.c ============================================================================== --- dvbmuxer/mpegpesenc.c (original) +++ dvbmuxer/mpegpesenc.c Tue Mar 11 18:16:52 2008 @@ -116,9 +116,9 @@ int ff_pes_get_nb_frames(AVFormatContext * @param [in] stuffing_size packet stuffing size * @return bytes written to PES stream. */ -int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t* pes_buffer, - int64_t pts,int64_t dts, int id, int startcode, - uint8_t* pes_content, int pes_content_len, +int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t *pes_buffer, + int64_t pts, int64_t dts, int id, int startcode, + uint8_t *pes_content, int pes_content_len, int header_len, int packet_size, int payload_size, int stuffing_size) { PESStream *stream = ctx->streams[stream_index]->priv_data; @@ -192,7 +192,7 @@ int ff_pes_remove_decoded_packets(AVForm for(i=0; i<ctx->nb_streams; i++){ AVStream *st = ctx->streams[i]; - PESStream *stream = st->priv_data; + PESStream *stream = st->priv_data; PacketDesc *pkt_desc; while((pkt_desc= stream->predecode_packet) @@ -222,7 +222,7 @@ int ff_pes_remove_decoded_packets(AVForm * @param[out] best_i index of stream to be muxed * @return On error a negative or zero value is returned, on success 1 is returned. */ -int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t *scr, int* best_i) +int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t *scr, int *best_i) { int i, avail_space; int best_score= INT_MIN;

1 0

[soc]: r2013 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 18:13:49 2008 New Revision: 2013 Log: cosmetics Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 18:13:49 2008 @@ -467,7 +467,7 @@ static int mpegts_write_header(AVFormatC if(s->mux_rate) { ts->mux_rate= s->mux_rate; } else { - bitrate += bitrate * 25 / (8 * DEFAULT_PES_PAYLOAD_SIZE) + /* PES header size */ + bitrate += bitrate * 25 / (8 * DEFAULT_PES_PAYLOAD_SIZE) + /* PES header size */ bitrate * 4 / (8 * TS_PACKET_SIZE) + /* TS header size */ 500 * 12 + /* SDT size */ 100 * 16; /* PAT size */

1 0

[soc]: r2012 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 18:12:27 2008 New Revision: 2012 Log: pcr indentifies the byte of program clock reference _base_, not ext Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 18:12:27 2008 @@ -557,7 +557,7 @@ static void mpegts_write_pes(AVFormatCon ts_st->cc = (ts_st->cc + 1) & 0xf; if (write_pcr) { /* add header and pcr bytes to pcr according to specs */ - pcr = ts->cur_pcr + (32+64) * 90000 / ts->mux_rate; + pcr = ts->cur_pcr + (32+56) * 90000 / ts->mux_rate; *q++ = 7; /* AFC length */ *q++ = 0x10; /* flags: PCR present */ *q++ = pcr >> 25;

1 0

[soc]: r2011 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 18:07:58 2008 New Revision: 2011 Log: simplify, only write pcr every 0.1s like specs mandates Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 18:07:58 2008 @@ -138,8 +138,7 @@ static int mpegts_write_section1(MpegTSS /* we retransmit the SI info at this rate */ #define SDT_RETRANS_TIME 500 #define PAT_RETRANS_TIME 100 -#define PCR_RETRANS_TIME 20 -#define MAX_DELTA_PCR 4500 /**< 90000 / PCR_RETRANS_TIME */ +#define MAX_DELTA_PCR 9000 /**< 0.1s according to ISO 13818-1 */ /** @@ -174,8 +173,6 @@ typedef struct MpegTSService { char *name; char *provider_name; int pcr_pid; - int pcr_packet_count; - int pcr_packet_freq; } MpegTSService; typedef struct MpegTSWrite { @@ -478,8 +475,6 @@ static int mpegts_write_header(AVFormatC } ts->last_pcr = ts->cur_pcr = 0; - service->pcr_packet_freq = (ts->mux_rate * PCR_RETRANS_TIME) / - (TS_PACKET_SIZE * 8 * 1000); ts->sdt_packet_freq = (ts->mux_rate * SDT_RETRANS_TIME) / (TS_PACKET_SIZE * 8 * 1000); ts->pat_packet_freq = (ts->mux_rate * PAT_RETRANS_TIME) / @@ -536,7 +531,6 @@ static void mpegts_write_pes(AVFormatCon int val, is_start, len, header_len, write_pcr; int afc_len, stuffing_len; int64_t pcr = -1; /* avoid warning */ - int64_t delta_pcr; int offset = 0; is_start = 1; @@ -544,13 +538,9 @@ static void mpegts_write_pes(AVFormatCon retransmit_si_info(s); write_pcr = 0; if (ts_st->pid == ts_st->service->pcr_pid) { - ts_st->service->pcr_packet_count++; - delta_pcr = ts->cur_pcr - ts->last_pcr; - if (ts_st->service->pcr_packet_count >= - ts_st->service->pcr_packet_freq || delta_pcr > MAX_DELTA_PCR) { - ts_st->service->pcr_packet_count = 0; + pcr = ts->cur_pcr + TS_PACKET_SIZE*90000LL / ts->mux_rate; + if (pcr - ts->last_pcr > MAX_DELTA_PCR) write_pcr = 1; - } } /* prepare packet header */

1 0

[soc]: r2010 - in dvbmuxer: mpegpesenc.c mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 15:44:31 2008 New Revision: 2010 Log: cosmetics Modified: dvbmuxer/mpegpesenc.c dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegpesenc.c ============================================================================== --- dvbmuxer/mpegpesenc.c (original) +++ dvbmuxer/mpegpesenc.c Tue Mar 11 15:44:31 2008 @@ -117,7 +117,7 @@ int ff_pes_get_nb_frames(AVFormatContext * @return bytes written to PES stream. */ int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t* pes_buffer, - int64_t pts,int64_t dts, int id, int startcode, + int64_t pts,int64_t dts, int id, int startcode, uint8_t* pes_content, int pes_content_len, int header_len, int packet_size, int payload_size, int stuffing_size) { @@ -232,8 +232,8 @@ int ff_pes_find_beststream(AVFormatConte retry: for(i=0; i<ctx->nb_streams; i++){ AVStream *st = ctx->streams[i]; - PESStream*stream = st->priv_data; - const int avail_data= av_fifo_size(&stream->fifo); + PESStream *stream = st->priv_data; + const int avail_data= av_fifo_size(&stream->fifo); const int space= stream->max_buffer_size - stream->buffer_index; int rel_space= 1024*space / stream->max_buffer_size; PacketDesc *next_pkt= stream->premux_packet; Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 15:44:31 2008 @@ -410,7 +410,6 @@ static int mpegts_write_header(AVFormatC else ts->packet_size = DEFAULT_PES_PAYLOAD_SIZE; - ts->pat.pid = PAT_PID; ts->pat.cc = 0; ts->pat.write_packet = section_write_packet; @@ -538,8 +537,8 @@ static void mpegts_write_pes(AVFormatCon int afc_len, stuffing_len; int64_t pcr = -1; /* avoid warning */ int64_t delta_pcr; - int offset = 0; + is_start = 1; while (payload_size > 0) { retransmit_si_info(s); @@ -647,7 +646,6 @@ static int flush_packet(AVFormatContext packet_size = s->packet_size; if (packet_size > 0) { - /* packet header size */ packet_size -= 6; @@ -762,7 +760,6 @@ static int output_packet(AVFormatContext es_size= flush_packet(ctx, best_i, AV_NOPTS_VALUE, AV_NOPTS_VALUE, trailer_size); } - if(ff_pes_remove_decoded_packets(ctx, s->last_pcr) < 0) return -1;

1 0

[soc]: r2009 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 15:41:39 2008 New Revision: 2009 Log: clean pcr computation Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 15:41:39 2008 @@ -549,11 +549,8 @@ static void mpegts_write_pes(AVFormatCon delta_pcr = ts->cur_pcr - ts->last_pcr; if (ts_st->service->pcr_packet_count >= ts_st->service->pcr_packet_freq || delta_pcr > MAX_DELTA_PCR) { - pcr = delta_pcr > MAX_DELTA_PCR ? ts->last_pcr + MAX_DELTA_PCR : ts->cur_pcr; - pcr += offset* 8*90000LL / ts->mux_rate; ts_st->service->pcr_packet_count = 0; write_pcr = 1; - ts->last_pcr = pcr; } } @@ -570,6 +567,8 @@ static void mpegts_write_pes(AVFormatCon *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0); ts_st->cc = (ts_st->cc + 1) & 0xf; if (write_pcr) { + /* add header and pcr bytes to pcr according to specs */ + pcr = ts->cur_pcr + (32+64) * 90000 / ts->mux_rate; *q++ = 7; /* AFC length */ *q++ = 0x10; /* flags: PCR present */ *q++ = pcr >> 25; @@ -578,6 +577,7 @@ static void mpegts_write_pes(AVFormatCon *q++ = pcr >> 1; *q++ = (pcr & 1) << 7; *q++ = 0; + ts->last_pcr = pcr; } /* header size */ header_len = q - buf; @@ -611,9 +611,8 @@ static void mpegts_write_pes(AVFormatCon offset += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); + ts->cur_pcr += TS_PACKET_SIZE*8*90000LL / ts->mux_rate; } - if(pcr != -1) - ts->cur_pcr = pcr; put_flush_packet(s->pb); } @@ -735,17 +734,11 @@ static int output_packet(AVFormatContext int es_size, trailer_size; int result; int best_i= -1; - int64_t pcr = s->cur_pcr; - MpegTSWriteStream *ts_st; + int64_t pcr = s->last_pcr; PacketDesc *timestamp_packet; if((result = ff_pes_find_beststream(ctx, s->packet_size, flush, &pcr, &best_i)) <= 0) return result; - - ts_st = ctx->streams[best_i]->priv_data; - if (ts_st->pid == ts_st->service->pcr_pid) { - s->cur_pcr = pcr; - } assert(best_i >= 0); st = ctx->streams[best_i]; @@ -754,8 +747,6 @@ static int output_packet(AVFormatContext assert(av_fifo_size(&stream->fifo) > 0); timestamp_packet= stream->premux_packet; - if(s->cur_pcr == 0) - s->cur_pcr = timestamp_packet->dts; if(timestamp_packet->unwritten_size == timestamp_packet->size){ trailer_size= 0; }else{

1 0

[soc]: r2008 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 14:50:36 2008 New Revision: 2008 Log: flush_packet does not need pcr Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 14:50:36 2008 @@ -631,7 +631,7 @@ static void put_padding_packet(uint8_t** } /* flush the packet on stream stream_index */ static int flush_packet(AVFormatContext *ctx, int stream_index, - int64_t pts, int64_t dts, int64_t pcr, int trailer_size) + int64_t pts, int64_t dts, int trailer_size) { MpegTSWrite *s = ctx->priv_data; MpegTSWriteStream *stream = ctx->streams[stream_index]->priv_data; @@ -765,10 +765,10 @@ static int output_packet(AVFormatContext if(timestamp_packet){ //av_log(ctx, AV_LOG_DEBUG, "dts:%f pts:%f pcr:%f stream:%d\n", timestamp_packet->dts/90000.0, timestamp_packet->pts/90000.0, pcr/90000.0, best_i); - es_size= flush_packet(ctx, best_i, timestamp_packet->pts, timestamp_packet->dts, pcr, trailer_size); + es_size= flush_packet(ctx, best_i, timestamp_packet->pts, timestamp_packet->dts, trailer_size); }else{ assert(av_fifo_size(&stream->fifo) == trailer_size); - es_size= flush_packet(ctx, best_i, AV_NOPTS_VALUE, AV_NOPTS_VALUE, pcr, trailer_size); + es_size= flush_packet(ctx, best_i, AV_NOPTS_VALUE, AV_NOPTS_VALUE, trailer_size); }

1 0

[soc]: r2007 - dvbmuxer/mpegpesenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 14:46:06 2008 New Revision: 2007 Log: move code back where it was Modified: dvbmuxer/mpegpesenc.c Modified: dvbmuxer/mpegpesenc.c ============================================================================== --- dvbmuxer/mpegpesenc.c (original) +++ dvbmuxer/mpegpesenc.c Tue Mar 11 14:46:06 2008 @@ -46,6 +46,10 @@ int ff_pes_muxer_init(AVFormatContext *c stream->max_buffer_size = 4 * 1024; break; case CODEC_TYPE_VIDEO: + if (st->codec->rc_buffer_size) + stream->max_buffer_size = 6*1024 + st->codec->rc_buffer_size/8; + else + stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default #if 0 /* see VCD standard, p. IV-7*/ stream->max_buffer_size = 46 * 1024; @@ -54,10 +58,6 @@ int ff_pes_muxer_init(AVFormatContext *c Right now it is also used for everything else.*/ stream->max_buffer_size = 230 * 1024; #endif - if (st->codec->rc_buffer_size) - stream->max_buffer_size = 6*1024 + st->codec->rc_buffer_size/8; - else - stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default break; case CODEC_TYPE_SUBTITLE: stream->max_buffer_size = 16 * 1024;

1 0

[soc]: r2006 - in dvbmuxer: mpegpes.h mpegpesenc.c mpegtsenc.c
by bcoudurier 11 Mar '08

11 Mar '08

Author: bcoudurier Date: Tue Mar 11 10:50:02 2008 New Revision: 2006 Log: remove useless variables and fields Modified: dvbmuxer/mpegpes.h dvbmuxer/mpegpesenc.c dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegpes.h ============================================================================== --- dvbmuxer/mpegpes.h (original) +++ dvbmuxer/mpegpes.h Tue Mar 11 10:50:02 2008 @@ -43,29 +43,13 @@ typedef struct PacketDesc { } PacketDesc; /** - * muxer type for PES - */ -typedef enum { - PESMUXER_PS, - PESMUXER_TS, - PESMUXER_PES -} PESMuxerType; - -/** - * PES context - */ -typedef struct { - PESMuxerType muxer_type; - int packet_number; -} PESContext; - -/** * PES stream structure */ typedef struct { AVFifoBuffer fifo; int max_buffer_size; /**< in bytes */ int buffer_index; + int packet_counter; PacketDesc *predecode_packet; PacketDesc *premux_packet; PacketDesc **next_packet; Modified: dvbmuxer/mpegpesenc.c ============================================================================== --- dvbmuxer/mpegpesenc.c (original) +++ dvbmuxer/mpegpesenc.c Tue Mar 11 10:50:02 2008 @@ -122,7 +122,6 @@ int ff_pes_muxer_write(AVFormatContext * int header_len, int packet_size, int payload_size, int stuffing_size) { PESStream *stream = ctx->streams[stream_index]->priv_data; - PESContext *context = ctx->priv_data; int pes_flags, i; int data_size = payload_size - stuffing_size; uint8_t *q = pes_buffer; @@ -144,7 +143,7 @@ int ff_pes_muxer_write(AVFormatContext * P-STD_buffer_size field be included in the first packet of every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2 and MPEG-2 standard 2.7.7) */ - if (context->packet_number == 0 && context->muxer_type == PESMUXER_PS) + if (stream->packet_counter == 0 && strcmp(ctx->oformat->name, "mpegts")) pes_flags |= 0x01; bytestream_put_byte(&q, pes_flags); /* flags */ Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Tue Mar 11 10:50:02 2008 @@ -179,7 +179,6 @@ typedef struct MpegTSService { } MpegTSService; typedef struct MpegTSWrite { - PESContext pes_context; MpegTSSection pat; /* MPEG2 pat table */ MpegTSSection sdt; /* MPEG2 sdt table context */ MpegTSService **services; @@ -459,7 +458,6 @@ static int mpegts_write_header(AVFormatC for(i=0;i<s->nb_streams;i++) { int codec_rate; st = s->streams[i]; - ts_st = (MpegTSWriteStream*) st->priv_data; if(st->codec->rc_max_rate) codec_rate= st->codec->rc_max_rate; else @@ -637,7 +635,6 @@ static int flush_packet(AVFormatContext { MpegTSWrite *s = ctx->priv_data; MpegTSWriteStream *stream = ctx->streams[stream_index]->priv_data; - PESContext* pes_context = &s->pes_context; PESStream *pes_stream = &stream->pes_stream; int payload_size, id, stuffing_size, i, header_len; int packet_size, es_size; @@ -691,8 +688,6 @@ static int flush_packet(AVFormatContext payload_size -= stuffing_size; stuffing_size = 0; } - pes_context->packet_number = s->packet_number; - pes_context->muxer_type = PESMUXER_TS; pes_size = ff_pes_muxer_write(ctx, stream_index, stream->payload, pts, dts, id, stream->startcode, NULL, 0, header_len, packet_size, payload_size, stuffing_size); if(pes_size < 0)

1 0

[soc]: r2005 - libavfilter/vf_drawbox.c
by vitor 10 Mar '08

10 Mar '08

Author: vitor Date: Mon Mar 10 23:06:42 2008 New Revision: 2005 Log: Change copyright line per author request Modified: libavfilter/vf_drawbox.c Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c (original) +++ libavfilter/vf_drawbox.c Mon Mar 10 23:06:42 2008 @@ -2,7 +2,7 @@ * Box drawing filter. Also a nice template for a filter that needs to write * in the input frame. * - * Copyright (c) 2008 Mike Sullivan + * Copyright (c) 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia) * * This file is part of FFmpeg. *

1 0