From 3d6413cfc617627bff518931c2534bf51f90a2d9 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu, 23 Apr 2015 00:39:44 +0300
Subject: [PATCH] fixed compile warnings; hopefully fixed test failures
(cherry picked from commit 30912b49f3514895efbc597da89e6421bf08e60b)
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
---
modules/highgui/src/cap_ffmpeg_impl.hpp | 27 +++++++++++++++++--------
modules/highgui/src/ffmpeg_codecs.hpp | 2 +-
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index 644313b2f9..1b798704fd 100644
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -1007,6 +1007,7 @@ struct CvVideoWriter_FFMPEG
int input_pix_fmt;
Image_FFMPEG temp_image;
int frame_width, frame_height;
+ int frame_idx;
bool ok;
struct SwsContext *img_convert_ctx;
};
@@ -1084,6 +1085,7 @@ void CvVideoWriter_FFMPEG::init()
memset(&temp_image, 0, sizeof(temp_image));
img_convert_ctx = 0;
frame_width = frame_height = 0;
+ frame_idx = 0;
ok = false;
}
@@ -1234,7 +1236,13 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
static const int OPENCV_NO_FRAMES_WRITTEN_CODE = 1000;
-static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, uint8_t * outbuf, uint32_t outbuf_size, AVFrame * picture )
+static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st,
+#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0)
+ uint8_t *, uint32_t,
+#else
+ uint8_t * outbuf, uint32_t outbuf_size,
+#endif
+ AVFrame * picture )
{
#if LIBAVFORMAT_BUILD > 4628
AVCodecContext * c = video_st->codec;
@@ -1269,14 +1277,14 @@ static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st,
pkt.size = 0;
ret = avcodec_encode_video2(c, &pkt, picture, &got_output);
if (ret < 0)
- got_output = 0;
+ ;
else if (got_output) {
- //if (c->coded_frame->pts != (int64_t)AV_NOPTS_VALUE)
- // pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
- //if (c->coded_frame->dts != (int64_t)AV_NOPTS_VALUE)
- // pkt.dts = av_rescale_q(c->coded_frame->dts, c->time_base, video_st->time_base);
- //if (pkt.duration)
- // pkt.duration = av_rescale_q(pkt.duration, c->time_base, video_st->time_base);
+ if (pkt.pts != (int64_t)AV_NOPTS_VALUE)
+ pkt.pts = av_rescale_q(pkt.pts, c->time_base, video_st->time_base);
+ if (pkt.dts != (int64_t)AV_NOPTS_VALUE)
+ pkt.dts = av_rescale_q(pkt.dts, c->time_base, video_st->time_base);
+ if (pkt.duration)
+ pkt.duration = av_rescale_q(pkt.duration, c->time_base, video_st->time_base);
pkt.stream_index= video_st->index;
ret = av_write_frame(oc, &pkt);
av_free_packet(&pkt);
@@ -1409,7 +1417,9 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
(PixelFormat)input_pix_fmt, width, height);
}
+ picture->pts = frame_idx;
ret = icv_av_write_frame_FFMPEG( oc, video_st, outbuf, outbuf_size, picture) >= 0;
+ frame_idx++;
return ret;
}
@@ -1721,6 +1731,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
}
frame_width = width;
frame_height = height;
+ frame_idx = 0;
ok = true;
return true;
diff --git a/modules/highgui/src/ffmpeg_codecs.hpp b/modules/highgui/src/ffmpeg_codecs.hpp
index 2512afff47..4059a3f443 100644
--- a/modules/highgui/src/ffmpeg_codecs.hpp
+++ b/modules/highgui/src/ffmpeg_codecs.hpp
@@ -104,7 +104,7 @@ typedef struct AVCodecTag {
#define AV_CODEC_ID_H264 CODEC_ID_H264
#define AV_CODEC_ID_H263 CODEC_ID_H263
#define AV_CODEC_ID_H263P CODEC_ID_H263P
-#define AV_CODEC_ID_H263 CODEC_ID_H261
+#define AV_CODEC_ID_H261 CODEC_ID_H261
#define AV_CODEC_ID_MPEG4 CODEC_ID_MPEG4
#define AV_CODEC_ID_MSMPEG4V3 CODEC_ID_MSMPEG4V3
#define AV_CODEC_ID_MSMPEG4V2 CODEC_ID_MSMPEG4V2