Merge "media: platform: msm: dvb: video frame event notification changes"

This commit is contained in:
Linux Build Service Account 2017-03-21 13:28:51 -07:00 committed by Gerrit - the friendly Code Review server
commit 75dc6ab1e7

View file

@ -3969,6 +3969,18 @@ static int mpq_dmx_process_video_packet_framing(
mpq_dmx_update_decoder_stat(mpq_feed);
if (video_b_frame_events == 1) {
if (non_predicted_video_frame == 0) {
struct dmx_pts_dts_info *pts_dts;
pts_dts =
&meta_data.info.framing.pts_dts_info;
pts_dts->pts_exist = 0;
pts_dts->pts = 0;
pts_dts->dts_exist = 0;
pts_dts->dts = 0;
}
}
/*
* Write meta-data that includes the framing information
*/
@ -3986,14 +3998,7 @@ static int mpq_dmx_process_video_packet_framing(
stream_buffer, &data, ret);
/* Trigger ES Data Event for VPTS */
if (video_b_frame_events == 1) {
if (non_predicted_video_frame == 1)
feed->data_ready_cb.ts
(&feed->feed.ts, &data);
} else {
feed->data_ready_cb.ts(&feed->feed.ts,
&data);
}
feed->data_ready_cb.ts(&feed->feed.ts, &data);
if (feed_data->video_buffer->mode ==
MPQ_STREAMBUFFER_BUFFER_MODE_LINEAR)