[FFmpeg-soc] [FFmpeg-devel] [Patch]GSoC 2008 qualification task TS Muxer

[Baptiste Coudurier]

Hi,

On Fri, Apr 04, 2008 at 01:50:18AM +0800, zhentan feng wrote:
> [...]
>
> --- ff_pes_cal_header_1/mpegpesenc.c	2008-04-03 21:32:51.000000000 +0800
> +++ 4.3/mpegpesenc.c	2008-04-04 01:41:44.000000000 +0800
> @@ -37,6 +37,7 @@
>      for(i=0;i<ctx->nb_streams;i++) {
>          st = ctx->streams[i];
>          stream = st->priv_data;
> +        stream->format = PES_FMT_TS;/* just initial for TS */
>          av_set_pts_info(st, 64, 1, 90000);

Separate patch.

> [...]
>
>          switch(st->codec->codec_type) {
> @@ -397,9 +398,10 @@
>   * Write packet into PES FIFO.
>   * @param [in] ctx  the AVFormatContext which contains streams.
>   * @param [in] pkt  the packet to write.
> + * @param [in] the pointer point to variable in PS struct
>   * @return  NULL
>   */
> -void ff_pes_write_packet(AVFormatContext *ctx, AVPacket *pkt)
> +void ff_pes_write_packet(AVFormatContext *ctx, AVPacket *pkt, int *packet_number)
>  {

Why a pointer ? Is the variable modified ?

> [...]
>
>  /**
>   * Find the stream to mux into the PES stream.
> diff -ur ff_pes_cal_header_1/mpegtsenc.c 4.3/mpegtsenc.c
> --- ff_pes_cal_header_1/mpegtsenc.c	2008-03-31 22:49:48.000000000 +0800
> +++ 4.3/mpegtsenc.c	2008-04-04 01:30:58.000000000 +0800
> @@ -630,7 +630,6 @@
>      int general_pack = 0;  /*"general" pack without data specific to one stream?*/
>      int pes_size;
>      uint8_t* q = stream->payload;
> -    pes_stream->format = PES_FMT_TS;
>

Separate patch.

[...]

--
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
SMARTJOG SAS                                     http://www.smartjog.com
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
Phone: +33 1 49966312