highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegts: add compute_pcr option.

Browse Source 
Deprecate the corresponding AVFormatParameters field.
This commit is contained in:
Anton Khirnov
2011-04-30 13:42:55 +02:00
parent 5dc8214420
commit 17a5556db5
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avformat.h
View File

@ -236,9 +236,10 @@ typedef struct AVFormatParameters {
int channel; /**< Used to select DV channel. */ int channel; /**< Used to select DV channel. */
const char *standard; /**< TV standard, NTSC, PAL, SECAM */ const char *standard; /**< TV standard, NTSC, PAL, SECAM */
unsigned int mpeg2ts_raw:1; /**< Force raw MPEG-2 transport stream output, if possible. */ unsigned int mpeg2ts_raw:1; /**< Force raw MPEG-2 transport stream output, if possible. */
unsigned int mpeg2ts_compute_pcr:1; /**< Compute exact PCR for each transport #if FF_API_FORMAT_PARAMETERS
stream packet (only meaningful if /**< deprecated, use mpegtsraw demuxer-specific options instead */
mpeg2ts_raw is TRUE). */ attribute_deprecated unsigned int mpeg2ts_compute_pcr:1;
#endif
unsigned int initial_pause:1; /**< Do not begin to play the stream unsigned int initial_pause:1; /**< Do not begin to play the stream
immediately (RTSP only). */ immediately (RTSP only). */
unsigned int prealloced_context:1; unsigned int prealloced_context:1;

20
libavformat/mpegts.c
View File

@ -25,6 +25,8 @@
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
#include "mpegts.h" #include "mpegts.h"
@ -86,6 +88,7 @@ struct Program {
}; };
struct MpegTSContext { struct MpegTSContext {
const AVClass *class;
/* user data */ /* user data */
AVFormatContext *stream; AVFormatContext *stream;
/** raw packet size, including FEC if present */ /** raw packet size, including FEC if present */
@ -122,6 +125,19 @@ struct MpegTSContext {
MpegTSFilter *pids[NB_PID_MAX]; MpegTSFilter *pids[NB_PID_MAX];
}; };
static const AVOption options[] = {
{"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), FF_OPT_TYPE_INT,
{.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
static const AVClass mpegtsraw_class = {
.class_name = "mpegtsraw demuxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
/* TS stream handling */ /* TS stream handling */
enum MpegTSState { enum MpegTSState {
@ -1455,7 +1471,10 @@ static int mpegts_read_header(AVFormatContext *s,
int64_t pos; int64_t pos;
if (ap) { if (ap) {
#if FF_API_FORMAT_PARAMETERS
if (ap->mpeg2ts_compute_pcr)
ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr; ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr;
#endif
if(ap->mpeg2ts_raw){ if(ap->mpeg2ts_raw){
av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n"); av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n");
return -1; return -1;
@ -1878,4 +1897,5 @@ AVInputFormat ff_mpegtsraw_demuxer = {
#ifdef USE_SYNCPOINT_SEARCH #ifdef USE_SYNCPOINT_SEARCH
.read_seek2 = read_seek2, .read_seek2 = read_seek2,
#endif #endif
.priv_class = &mpegtsraw_class,
}; };

3
libavformat/version.h
View File

@ -68,5 +68,8 @@
#ifndef FF_API_SDP_CREATE #ifndef FF_API_SDP_CREATE
#define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_FORMAT_PARAMETERS
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif /* AVFORMAT_VERSION_H */ #endif /* AVFORMAT_VERSION_H */