generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code review fixes.

Browse Source
This commit is contained in:
Alexander Smorkalov 2014-09-16 13:57:44 +04:00
parent 3ea8be7292
commit 38887e6ea9
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/videoio/src/cap_gstreamer.cpp
View File

@ -557,7 +557,6 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
bool stream = false; bool stream = false;
bool manualpipeline = false; bool manualpipeline = false;
bool st;
char *uri = NULL; char *uri = NULL;
uridecodebin = NULL; uridecodebin = NULL;
GstElementFactory * testfac; GstElementFactory * testfac;
@ -744,7 +743,7 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
gst_app_sink_set_caps(GST_APP_SINK(sink), caps); gst_app_sink_set_caps(GST_APP_SINK(sink), caps);
gst_caps_unref(caps); gst_caps_unref(caps);
// For fideo files only: set pipeline to PAUSED state to get its duration // For video files only: set pipeline to PAUSED state to get its duration
if (stream) if (stream)
{ {
status = gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PAUSED); status = gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PAUSED);
@ -766,15 +765,12 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
GstFormat format; GstFormat format;
#if GST_VERSION_MAJOR == 0
#define FORMAT &format
#else
#define FORMAT format
#endif
format = GST_FORMAT_DEFAULT; format = GST_FORMAT_DEFAULT;
st = gst_element_query_duration(sink, FORMAT, &duration); #if GST_VERSION_MAJOR == 0
if(!st) if(!gst_element_query_duration(sink, &format, &duration))
#else
if(!gst_element_query_duration(sink, format, &duration))
#endif
{ {
CV_WARN("GStreamer: unable to query duration of stream"); CV_WARN("GStreamer: unable to query duration of stream");
duration = -1; duration = -1;
@ -1079,16 +1075,22 @@ void CvVideoWriter_GStreamer::close()
GstStateChangeReturn status; GstStateChangeReturn status;
if (pipeline) if (pipeline)
{ {
//handleMessage(pipeline); handleMessage(pipeline);
if (gst_app_src_end_of_stream(GST_APP_SRC(source)) != GST_FLOW_OK) if (gst_app_src_end_of_stream(GST_APP_SRC(source)) != GST_FLOW_OK)
{
CV_WARN("Cannot send EOS to GStreamer pipeline\n"); CV_WARN("Cannot send EOS to GStreamer pipeline\n");
return;
}
//wait for EOS to trickle down the pipeline. This will let all elements finish properly //wait for EOS to trickle down the pipeline. This will let all elements finish properly
GstBus* bus = gst_element_get_bus(pipeline); GstBus* bus = gst_element_get_bus(pipeline);
GstMessage *msg = gst_bus_timed_pop_filtered(bus, GST_CLOCK_TIME_NONE, (GstMessageType)(GST_MESSAGE_ERROR | GST_MESSAGE_EOS)); GstMessage *msg = gst_bus_timed_pop_filtered(bus, GST_CLOCK_TIME_NONE, (GstMessageType)(GST_MESSAGE_ERROR | GST_MESSAGE_EOS));
if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_ERROR) if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_ERROR)
{
CV_WARN("Error during VideoWriter finalization\n"); CV_WARN("Error during VideoWriter finalization\n");
return;
}
if(msg != NULL) if(msg != NULL)
{ {
@ -1435,7 +1437,7 @@ bool CvVideoWriter_GStreamer::writeFrame( const IplImage * image )
} }
#endif #endif
else { else {
fprintf(stderr, "Invalid video format!\n"); CV_WARN("Invalid video format!\n");
return false; return false;
} }

3
modules/videoio/test/test_video_io.cpp
View File

@ -490,7 +490,6 @@ void CV_VideoIOTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
if (fourcc == VideoWriter::fourcc('M', 'P', 'E', 'G') && ext == "mkv") if (fourcc == VideoWriter::fourcc('M', 'P', 'E', 'G') && ext == "mkv")
allowed_extra_frames = 1; allowed_extra_frames = 1;
/*
if (FRAME_COUNT < IMAGE_COUNT || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames) if (FRAME_COUNT < IMAGE_COUNT || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames)
{ {
ts->printf(ts->LOG, "\nFrame count checking for video_%s.%s...\n", fourcc_str.c_str(), ext.c_str()); ts->printf(ts->LOG, "\nFrame count checking for video_%s.%s...\n", fourcc_str.c_str(), ext.c_str());
@ -505,7 +504,7 @@ void CV_VideoIOTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
ts->set_failed_test_info(ts->FAIL_BAD_ACCURACY); ts->set_failed_test_info(ts->FAIL_BAD_ACCURACY);
return; return;
} }
*/
for (int i = 0; (size_t)i < IMAGE_COUNT; i++) for (int i = 0; (size_t)i < IMAGE_COUNT; i++)
{ {
Mat frame; cap >> frame; Mat frame; cap >> frame;