Media Hub

Merge lp:~thomas-voss/media-hub/more-verbose-output-for-gst-error-messages into lp:media-hub

  1. more-verbose-output-for-gst-error-messages
  2. Merge into trunk
Proposed by Thomas Voß
Status: Work in progress
Proposed branch: lp:~thomas-voss/media-hub/more-verbose-output-for-gst-error-messages
Merge into: lp:media-hub
Diff against target: 110 lines (+37/-0)
2 files modified
src/core/media/gstreamer/engine.cpp (+30/-0)
src/core/media/gstreamer/playbin.cpp (+7/-0)
To merge this branch: bzr merge lp:~thomas-voss/media-hub/more-verbose-output-for-gst-error-messages
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+282281@code.launchpad.net

Commit message

Be more verbose about gstreamer error messages.

Description of the change

Be more verbose about gstreamer error messages.

To post a comment you must log in.
lp:~thomas-voss/media-hub/more-verbose-output-for-gst-error-messages updated
166. By Thomas Voß

Instrument setup_video_sink_for_buffers.

Unmerged revisions

166. By Thomas Voß

Instrument setup_video_sink_for_buffers.

165. By Thomas Voß

Be more verbose about gstreamer error messages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/media/gstreamer/engine.cpp'
2--- src/core/media/gstreamer/engine.cpp 2015-09-04 18:46:08 +0000
3+++ src/core/media/gstreamer/engine.cpp 2016-01-15 08:28:34 +0000
4@@ -120,30 +120,51 @@
5 {
6 case GST_RESOURCE_ERROR_FAILED:
7 std::cerr << "** Encountered a GST_RESOURCE_ERROR_FAILED" << std::endl;
8+ std::cerr << " " << ewi.error->message << std::endl;
9+ if (ewi.debug)
10+ std::cerr << " " << ewi.debug << std::endl;
11 ret_error = media::Player::Error::resource_error;
12 break;
13 case GST_RESOURCE_ERROR_NOT_FOUND:
14 std::cerr << "** Encountered a GST_RESOURCE_ERROR_NOT_FOUND" << std::endl;
15+ std::cerr << " " << ewi.error->message << std::endl;
16+ if (ewi.debug)
17+ std::cerr << " " << ewi.debug << std::endl;
18 ret_error = media::Player::Error::resource_error;
19 break;
20 case GST_RESOURCE_ERROR_OPEN_READ:
21 std::cerr << "** Encountered a GST_RESOURCE_ERROR_OPEN_READ" << std::endl;
22+ std::cerr << " " << ewi.error->message << std::endl;
23+ if (ewi.debug)
24+ std::cerr << " " << ewi.debug << std::endl;
25 ret_error = media::Player::Error::resource_error;
26 break;
27 case GST_RESOURCE_ERROR_OPEN_WRITE:
28 std::cerr << "** Encountered a GST_RESOURCE_ERROR_OPEN_WRITE" << std::endl;
29+ std::cerr << " " << ewi.error->message << std::endl;
30+ if (ewi.debug)
31+ std::cerr << " " << ewi.debug << std::endl;
32 ret_error = media::Player::Error::resource_error;
33 break;
34 case GST_RESOURCE_ERROR_READ:
35 std::cerr << "** Encountered a GST_RESOURCE_ERROR_READ" << std::endl;
36+ std::cerr << " " << ewi.error->message << std::endl;
37+ if (ewi.debug)
38+ std::cerr << " " << ewi.debug << std::endl;
39 ret_error = media::Player::Error::resource_error;
40 break;
41 case GST_RESOURCE_ERROR_WRITE:
42 std::cerr << "** Encountered a GST_RESOURCE_ERROR_WRITE" << std::endl;
43+ std::cerr << " " << ewi.error->message << std::endl;
44+ if (ewi.debug)
45+ std::cerr << " " << ewi.debug << std::endl;
46 ret_error = media::Player::Error::resource_error;
47 break;
48 case GST_RESOURCE_ERROR_NOT_AUTHORIZED:
49 std::cerr << "** Encountered a GST_RESOURCE_ERROR_NOT_AUTHORIZED" << std::endl;
50+ std::cerr << " " << ewi.error->message << std::endl;
51+ if (ewi.debug)
52+ std::cerr << " " << ewi.debug << std::endl;
53 ret_error = media::Player::Error::access_denied_error;
54 break;
55 default:
56@@ -159,15 +180,24 @@
57 {
58 case GST_STREAM_ERROR_FAILED:
59 std::cerr << "** Encountered a GST_STREAM_ERROR_FAILED" << std::endl;
60+ std::cerr << " " << ewi.error->message << std::endl;
61+ if (ewi.debug)
62+ std::cerr << " " << ewi.debug << std::endl;
63 ret_error = media::Player::Error::resource_error;
64 break;
65 case GST_STREAM_ERROR_CODEC_NOT_FOUND:
66 std::cerr << "** Encountered a GST_STREAM_ERROR_CODEC_NOT_FOUND" << std::endl;
67+ std::cerr << " " << ewi.error->message << std::endl;
68+ if (ewi.debug)
69+ std::cerr << " " << ewi.debug << std::endl;
70 // Missing codecs are handled later, when state switches to "paused"
71 ret_error = media::Player::Error::no_error;
72 break;
73 case GST_STREAM_ERROR_DECODE:
74 std::cerr << "** Encountered a GST_STREAM_ERROR_DECODE" << std::endl;
75+ std::cerr << " " << ewi.error->message << std::endl;
76+ if (ewi.debug)
77+ std::cerr << " " << ewi.debug << std::endl;
78 ret_error = media::Player::Error::format_error;
79 break;
80 default:
81
82=== modified file 'src/core/media/gstreamer/playbin.cpp'
83--- src/core/media/gstreamer/playbin.cpp 2015-12-16 16:55:51 +0000
84+++ src/core/media/gstreamer/playbin.cpp 2016-01-15 08:28:34 +0000
85@@ -32,11 +32,14 @@
86 {
87 void setup_video_sink_for_buffer_streaming(GstElement* pipeline)
88 {
89+ std::cout << __PRETTY_FUNCTION__ << std::endl;
90 // Get the service-side BufferQueue (IGraphicBufferProducer) and associate it with
91 // the SurfaceTextureClientHybris instance
92 IGBPWrapperHybris igbp = decoding_service_get_igraphicbufferproducer();
93 SurfaceTextureClientHybris stc = surface_texture_client_create_by_igbp(igbp);
94
95+
96+
97 // Because mirsink is being loaded, we are definitely doing * hardware rendering.
98 surface_texture_client_set_hardware_rendering(stc, TRUE);
99
100@@ -44,6 +47,10 @@
101 GstStructure *structure = gst_context_writable_structure(context);
102 gst_structure_set(structure, "gst_mir_context", G_TYPE_POINTER, stc, NULL);
103
104+ std::cout << " igbp: " << igbp << std::endl;
105+ std::cout << " stc : " << stc << std::endl;
106+ std::cout << " ctx : " << context << std::endl;
107+
108 /* Propagate context in pipeline (needed by amchybris and mirsink) */
109 gst_element_set_context(pipeline, context);
110 }

Subscribers

People subscribed via source and target branches