mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264: fix presentation timestamps.

Browse source
This commit is contained in:
Gwenole Beauchesne 2012-01-23 15:20:51 +01:00
parent 16ccf82363
commit 61753fd55a
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <gst/base/gstadapter.h>
#include <gst/codecparsers/gsth264parser.h> #include <gst/codecparsers/gsth264parser.h>
#include "gstvaapidecoder_h264.h" #include "gstvaapidecoder_h264.h"
#include "gstvaapidecoder_objects.h" #include "gstvaapidecoder_objects.h"
@ -248,6 +249,7 @@ G_DEFINE_TYPE(GstVaapiDecoderH264,
#define BOTTOM_FIELD 1 #define BOTTOM_FIELD 1
struct _GstVaapiDecoderH264Private { struct _GstVaapiDecoderH264Private {
GstAdapter *adapter;
GstBuffer *sub_buffer; GstBuffer *sub_buffer;
GstH264NalParser *parser; GstH264NalParser *parser;
GstH264SPS *sps; GstH264SPS *sps;
@ -355,6 +357,12 @@ gst_vaapi_decoder_h264_close(GstVaapiDecoderH264 *decoder)
priv->dpb[i] = NULL; priv->dpb[i] = NULL;
priv->dpb_count = 0; priv->dpb_count = 0;
} }
if (priv->adapter) {
gst_adapter_clear(priv->adapter);
g_object_unref(priv->adapter);
priv->adapter = NULL;
}
} }
static gboolean static gboolean
@ -364,6 +372,10 @@ gst_vaapi_decoder_h264_open(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
gst_vaapi_decoder_h264_close(decoder); gst_vaapi_decoder_h264_close(decoder);
priv->adapter = gst_adapter_new();
if (!priv->adapter)
return FALSE;
priv->parser = gst_h264_nal_parser_new(); priv->parser = gst_h264_nal_parser_new();
if (!priv->parser) if (!priv->parser)
return FALSE; return FALSE;
@ -1335,6 +1347,7 @@ init_picture(
picture->is_idr = nalu->type == GST_H264_NAL_SLICE_IDR; picture->is_idr = nalu->type == GST_H264_NAL_SLICE_IDR;
picture->field_pic_flag = slice_hdr->field_pic_flag; picture->field_pic_flag = slice_hdr->field_pic_flag;
picture->bottom_field_flag = slice_hdr->bottom_field_flag; picture->bottom_field_flag = slice_hdr->bottom_field_flag;
base_picture->pts = gst_adapter_prev_timestamp(priv->adapter, NULL);
/* Reset decoder state for IDR pictures */ /* Reset decoder state for IDR pictures */
if (picture->is_idr) { if (picture->is_idr) {
@ -1858,6 +1871,9 @@ decode_buffer(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
if (!buf && buf_size == 0) if (!buf && buf_size == 0)
return decode_sequence_end(decoder); return decode_sequence_end(decoder);
gst_buffer_ref(buffer);
gst_adapter_push(priv->adapter, buffer);
if (priv->sub_buffer) { if (priv->sub_buffer) {
buffer = gst_buffer_merge(priv->sub_buffer, buffer); buffer = gst_buffer_merge(priv->sub_buffer, buffer);
if (!buffer) if (!buffer)
@ -1893,7 +1909,10 @@ decode_buffer(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
if (status != GST_VAAPI_DECODER_STATUS_SUCCESS) if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
break; break;
ofs = nalu.offset + nalu.size; ofs = nalu.offset - ofs;
if (gst_adapter_available(priv->adapter) >= ofs)
gst_adapter_flush(priv->adapter, ofs);
switch (nalu.type) { switch (nalu.type) {
case GST_H264_NAL_SLICE_IDR: case GST_H264_NAL_SLICE_IDR:
/* fall-through. IDR specifics are handled in init_picture() */ /* fall-through. IDR specifics are handled in init_picture() */
@ -1917,6 +1936,10 @@ decode_buffer(GstVaapiDecoderH264 *decoder, GstBuffer *buffer)
status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER; status = GST_VAAPI_DECODER_STATUS_ERROR_BITSTREAM_PARSER;
break; break;
} }
if (gst_adapter_available(priv->adapter) >= nalu.size)
gst_adapter_flush(priv->adapter, nalu.size);
ofs = nalu.offset + nalu.size;
} while (status == GST_VAAPI_DECODER_STATUS_SUCCESS && ofs < buf_size); } while (status == GST_VAAPI_DECODER_STATUS_SUCCESS && ofs < buf_size);
return status; return status;
} }
@ -2076,6 +2099,7 @@ gst_vaapi_decoder_h264_init(GstVaapiDecoderH264 *decoder)
priv->mb_y = 0; priv->mb_y = 0;
priv->mb_width = 0; priv->mb_width = 0;
priv->mb_height = 0; priv->mb_height = 0;
priv->adapter = NULL;
priv->sub_buffer = NULL; priv->sub_buffer = NULL;
priv->field_poc[0] = 0; priv->field_poc[0] = 0;
priv->field_poc[1] = 0; priv->field_poc[1] = 0;