Commit fc68a8f7 authored by Anton Khirnov's avatar Anton Khirnov
Browse files

lavf: deprecate AVFormatParameters.standard.

parent b3da2692
...@@ -277,6 +277,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -277,6 +277,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec->time_base.den = frame_rate; st->codec->time_base.den = frame_rate;
st->codec->time_base.num = frame_rate_base; st->codec->time_base.num = frame_rate_base;
#if FF_API_FORMAT_PARAMETERS
if (ap->standard) { if (ap->standard) {
if (!strcasecmp(ap->standard, "pal")) if (!strcasecmp(ap->standard, "pal"))
s->standard = PAL; s->standard = PAL;
...@@ -285,6 +286,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -285,6 +286,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
else if (!strcasecmp(ap->standard, "ntsc")) else if (!strcasecmp(ap->standard, "ntsc"))
s->standard = NTSC; s->standard = NTSC;
} }
#endif
if (bktr_init(s1->filename, width, height, s->standard, if (bktr_init(s1->filename, width, height, s->standard,
&(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0) &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0)
......
...@@ -93,12 +93,14 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap ...@@ -93,12 +93,14 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
if (!dv->dv_demux) if (!dv->dv_demux)
goto failed; goto failed;
#if FF_API_FORMAT_PARAMETERS
if (ap->standard) { if (ap->standard) {
if (!strcasecmp(ap->standard, "pal")) if (!strcasecmp(ap->standard, "pal"))
dv->format = DV1394_PAL; dv->format = DV1394_PAL;
else else
dv->format = DV1394_NTSC; dv->format = DV1394_NTSC;
} }
#endif
if (ap->channel) if (ap->channel)
dv->channel = ap->channel; dv->channel = ap->channel;
......
...@@ -136,6 +136,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -136,6 +136,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
/* set tv standard */ /* set tv standard */
if (!ioctl(video_fd, VIDIOCGTUNER, &tuner)) { if (!ioctl(video_fd, VIDIOCGTUNER, &tuner)) {
#if FF_API_FORMAT_PARAMETERS
if (ap->standard) { if (ap->standard) {
if (!strcasecmp(ap->standard, "pal")) if (!strcasecmp(ap->standard, "pal"))
s->standard = VIDEO_MODE_PAL; s->standard = VIDEO_MODE_PAL;
...@@ -144,6 +145,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -144,6 +145,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
else else
s->standard = VIDEO_MODE_NTSC; s->standard = VIDEO_MODE_NTSC;
} }
#endif
tuner.mode = s->standard; tuner.mode = s->standard;
ioctl(video_fd, VIDIOCSTUNER, &tuner); ioctl(video_fd, VIDIOCSTUNER, &tuner);
} }
......
...@@ -470,10 +470,12 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -470,10 +470,12 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
} }
} }
#if FF_API_FORMAT_PARAMETERS
if (ap->standard) { if (ap->standard) {
av_freep(&s->standard); av_freep(&s->standard);
s->standard = av_strdup(ap->standard); s->standard = av_strdup(ap->standard);
} }
#endif
if (s->standard) { if (s->standard) {
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n", av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
......
...@@ -236,8 +236,8 @@ typedef struct AVFormatParameters { ...@@ -236,8 +236,8 @@ typedef struct AVFormatParameters {
int height; int height;
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
int channel; /**< Used to select DV channel. */ int channel; /**< Used to select DV channel. */
const char *standard; /**< TV standard, NTSC, PAL, SECAM */
#if FF_API_FORMAT_PARAMETERS #if FF_API_FORMAT_PARAMETERS
attribute_deprecated const char *standard; /**< deprecated, use demuxer-specific options instead. */
attribute_deprecated unsigned int mpeg2ts_raw:1; /**< deprecated, use mpegtsraw demuxer */ attribute_deprecated unsigned int mpeg2ts_raw:1; /**< deprecated, use mpegtsraw demuxer */
/**< deprecated, use mpegtsraw demuxer-specific options instead */ /**< deprecated, use mpegtsraw demuxer-specific options instead */
attribute_deprecated unsigned int mpeg2ts_compute_pcr:1; attribute_deprecated unsigned int mpeg2ts_compute_pcr:1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment