diff options
| author | David Schleef <ds@schleef.org> | 2010-11-29 20:21:31 -0800 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2010-11-30 18:34:34 -0800 |
| commit | 01574dc012495522170a97c1902ca18e6038785e (patch) | |
| tree | e00f25b0a74c79289a1bab2db64c6dff7e5d392a | |
| parent | aa93b5b45898cf1f0e70ba56be5d95bea903ebba (diff) | |
vp8enc: Don't override timestamps set by base class
Because the base class does it correctly.
Fixes: #635720, #625558.
| -rw-r--r-- | ext/vp8/gstvp8enc.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c index 3121623d1..1253a39f5 100644 --- a/ext/vp8/gstvp8enc.c +++ b/ext/vp8/gstvp8enc.c @@ -934,10 +934,6 @@ gst_vp8_enc_shape_output (GstBaseVideoEncoder * base_video_encoder, encoder->keyframe_distance++; } - GST_BUFFER_TIMESTAMP (buf) = gst_video_state_get_timestamp (state, - &GST_BASE_VIDEO_CODEC (base_video_encoder)->segment, - frame->presentation_frame_number); - GST_BUFFER_DURATION (buf) = 0; GST_BUFFER_OFFSET_END (buf) = _to_granulepos (frame->presentation_frame_number + 1, inv_count, encoder->keyframe_distance); @@ -965,22 +961,6 @@ gst_vp8_enc_shape_output (GstBaseVideoEncoder * base_video_encoder, encoder->keyframe_distance++; } - GST_BUFFER_TIMESTAMP (buf) = gst_video_state_get_timestamp (state, - &GST_BASE_VIDEO_CODEC (base_video_encoder)->segment, - frame->presentation_frame_number); - GST_BUFFER_DURATION (buf) = - gst_video_state_get_timestamp (state, - &GST_BASE_VIDEO_CODEC (base_video_encoder)->segment, - frame->presentation_frame_number + 1) - GST_BUFFER_TIMESTAMP (buf); - GST_BUFFER_OFFSET_END (buf) = - _to_granulepos (frame->presentation_frame_number + 1, 0, - encoder->keyframe_distance); - GST_BUFFER_OFFSET (buf) = - gst_util_uint64_scale (frame->presentation_frame_number + 1, - GST_SECOND * state->fps_d, state->fps_n); - - gst_buffer_set_caps (buf, GST_BASE_VIDEO_CODEC (base_video_encoder)->caps); - ret = gst_pad_push (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder), buf); if (ret != GST_FLOW_OK) { GST_WARNING_OBJECT (encoder, "flow error %d", ret); |