On Mon, 27 Feb 2012 23:04:09 +0100, Luca Barbato <[email protected]> wrote:
> ---
> libavformat/avformat.h | 70
> ++++++++++++++++++++++++++----------------------
> 1 files changed, 38 insertions(+), 32 deletions(-)
>
> diff --git a/libavformat/avformat.h b/libavformat/avformat.h
> index 58565fb..ce5ee07 100644
> --- a/libavformat/avformat.h
> +++ b/libavformat/avformat.h
> @@ -566,7 +566,6 @@ typedef struct AVStream {
> * encoding: set by libavformat in av_write_header
> */
> AVRational time_base;
> - enum AVDiscard discard; ///< Selects which packets can be discarded at
> will and do not need to be demuxed.
>
> /**
> * Decoding: pts of the first frame of the stream, in stream time base.
> @@ -587,6 +586,8 @@ typedef struct AVStream {
>
> int disposition; /**< AV_DISPOSITION_* bit field */
>
> + enum AVDiscard discard; ///< Selects which packets can be discarded at
> will and do not need to be demuxed.
> +
> /**
> * sample aspect ratio (0 if unknown)
> * - encoding: Set by user.
> @@ -610,11 +611,6 @@ typedef struct AVStream {
> */
>
> /**
> - * Number of frames that have been demuxed during av_find_stream_info()
> - */
> - int codec_info_nb_frames;
> -
> - /**
> * Stream information used internally by av_find_stream_info()
> */
> #define MAX_STD_TIMEBASES (60*12+5)
> @@ -626,9 +622,12 @@ typedef struct AVStream {
> int64_t codec_info_duration;
> int nb_decoded_frames;
> } *info;
> +
> + AVPacket cur_pkt;
> const uint8_t *cur_ptr;
> int cur_len;
> - AVPacket cur_pkt;
> +
> + int pts_wrap_bits; /**< number of bits in pts (used for wrapping
> control) */
>
> // Timestamp generation support:
> /**
> @@ -641,8 +640,8 @@ typedef struct AVStream {
> int64_t reference_dts;
> int64_t first_dts;
> int64_t cur_dts;
> - int last_IP_duration;
> int64_t last_IP_pts;
> + int last_IP_duration;
>
> /**
> * Number of packets to buffer for codec probing
> @@ -651,22 +650,26 @@ typedef struct AVStream {
> int probe_packets;
>
> /**
> + * Number of frames that have been demuxed during av_find_stream_info()
> + */
> + int codec_info_nb_frames;
> +
> + /* av_read_frame() support */
> + enum AVStreamParseType need_parsing;
> + struct AVCodecParserContext *parser;
> +
> + /**
> * last packet in packet_buffer for this stream when muxing.
> */
> struct AVPacketList *last_in_packet_buffer;
> AVProbeData probe_data;
> #define MAX_REORDER_DELAY 16
> int64_t pts_buffer[MAX_REORDER_DELAY+1];
> - /* av_read_frame() support */
> - enum AVStreamParseType need_parsing;
> - struct AVCodecParserContext *parser;
>
> AVIndexEntry *index_entries; /**< Only used if the format does not
> support seeking natively. */
> int nb_index_entries;
> unsigned int index_entries_allocated_size;
> -
> - int pts_wrap_bits; /**< number of bits in pts (used for wrapping
> control) */
> } AVStream;
>
The AVStream part looks ok.
> #define AV_PROGRAM_RUNNING 1
> @@ -739,6 +742,9 @@ typedef struct AVFormatContext {
> */
> AVIOContext *pb;
>
> + /* stream info */
> + int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
> +
> /**
> * A list of all streams in the file. New streams are created with
> * avformat_new_stream().
> @@ -752,8 +758,6 @@ typedef struct AVFormatContext {
> AVStream **streams;
>
> char filename[1024]; /**< input or output filename */
> - /* stream info */
> - int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
>
> /**
> * Decoding: position of the first frame of the component, in
> @@ -846,12 +850,6 @@ typedef struct AVFormatContext {
> unsigned int nb_chapters;
> AVChapter **chapters;
>
> - /**
> - * Flags to enable debugging.
> - */
> - int debug;
> -#define FF_FDEBUG_TS 0x0001
> -
> AVDictionary *metadata;
>
> /**
> @@ -894,6 +892,21 @@ typedef struct AVFormatContext {
> * New public fields should be added right above.
> *****************************************************************
> */
> +
> + /**
> + * This buffer is only needed when packets were already buffered but
> + * not decoded, for example to get the codec parameters in MPEG
> + * streams.
> + */
> + struct AVPacketList *packet_buffer;
> + struct AVPacketList *packet_buffer_end;
> +
> + /* av_read_frame() support */
> + AVStream *cur_st;
> +
> + /* av_seek_frame() support */
> + int64_t data_offset; /**< offset of the first packet */
> +
> /**
> * Raw packets from the demuxer, prior to parsing and decoding.
> * This buffer is used for buffering packets until the codec can
> @@ -909,18 +922,11 @@ typedef struct AVFormatContext {
> int raw_packet_buffer_remaining_size;
>
> /**
> - * This buffer is only needed when packets were already buffered but
> - * not decoded, for example to get the codec parameters in MPEG
> - * streams.
> + * Flags to enable debugging.
> + * @deprecated use framecrc or ctx_flags
> */
> - struct AVPacketList *packet_buffer;
> - struct AVPacketList *packet_buffer_end;
> -
> - /* av_read_frame() support */
> - AVStream *cur_st;
> -
> - /* av_seek_frame() support */
> - int64_t data_offset; /**< offset of the first packet */
> + attribute_deprecated int debug;
You're moving debug to the private area.
And I really don't like that you're deprecating it in the
reordering patch. Please split it to a separate patch.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
