summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libvdpau/dpb.c15
-rw-r--r--src/libvdpau/dpb.h1
-rw-r--r--src/libvdpau/vdpau_h264.c8
-rw-r--r--src/libvdpau/vdpau_mpeg12.c55
4 files changed, 61 insertions, 18 deletions
diff --git a/src/libvdpau/dpb.c b/src/libvdpau/dpb.c
index 12167d393..e397449f9 100644
--- a/src/libvdpau/dpb.c
+++ b/src/libvdpau/dpb.c
@@ -303,6 +303,21 @@ int dpb_flush(struct dpb *dpb)
return 0;
}
+void dpb_free_all( struct dpb *dpb )
+{
+ struct decoded_picture *pic = dpb->pictures;
+
+ if (pic != NULL)
+ do {
+ struct decoded_picture *next_pic = pic->next;
+ free_decoded_picture(pic);
+ --dpb->used;
+ pic = next_pic;
+ } while (pic != NULL);
+
+ printf("dpb_free_all, used: %d\n", dpb->used);
+}
+
void fill_vdpau_reference_list(struct dpb *dpb, VdpReferenceFrameH264 *reflist)
{
struct decoded_picture *pic = dpb->pictures;
diff --git a/src/libvdpau/dpb.h b/src/libvdpau/dpb.h
index b3999f125..30a0da50b 100644
--- a/src/libvdpau/dpb.h
+++ b/src/libvdpau/dpb.h
@@ -69,6 +69,7 @@ int dpb_set_output_picture(struct dpb *dpb, struct decoded_picture *outpic);
int dpb_remove_picture(struct dpb *dpb, struct decoded_picture *rempic);
int dpb_add_picture(struct dpb *dpb, struct decoded_picture *pic, uint32_t num_ref_frames);
int dpb_flush(struct dpb *dpb);
+void dpb_free_all( struct dpb *dpb );
void fill_vdpau_reference_list(struct dpb *dpb, VdpReferenceFrameH264 *reflist);
diff --git a/src/libvdpau/vdpau_h264.c b/src/libvdpau/vdpau_h264.c
index 438ba9921..ba458abb6 100644
--- a/src/libvdpau/vdpau_h264.c
+++ b/src/libvdpau/vdpau_h264.c
@@ -424,14 +424,14 @@ static void vdpau_h264_decode_data (video_decoder_t *this_gen,
VdpVideoSurface surface = this->vdpau_accel->surface;
- if(surface == VDP_INVALID_HANDLE) {
+ /*if(surface == VDP_INVALID_HANDLE) {
VdpStatus status = this->vdpau_accel->vdp_video_surface_create(this->vdpau_accel->vdp_device,
VDP_CHROMA_TYPE_420, this->width, this->height,
&surface);
this->vdpau_accel->surface = surface;
if(status != VDP_STATUS_OK)
xprintf(this->xine, XINE_VERBOSITY_LOG, "vdpau_h264: Surface creation failed: %s\n", this->vdpau_accel->vdp_get_error_string(status));
- }
+ }*/
//printf("Decode: NUM: %d, REF: %d, BYTES: %d, PTS: %lld\n", pic.frame_num, pic.is_reference, vdp_buffer.bitstream_bytes, buf->pts);
VdpStatus status = this->vdpau_accel->vdp_decoder_render(this->decoder,
@@ -539,7 +539,7 @@ static void vdpau_h264_reset (video_decoder_t *this_gen) {
this->size = 0;
- dpb_flush( &(this->nal_parser->dpb) );
+ dpb_free_all( &(this->nal_parser->dpb) );
if (this->decoder_initialized)
this->vdpau_accel->vdp_decoder_destroy( this->decoder );
@@ -574,7 +574,7 @@ static void vdpau_h264_dispose (video_decoder_t *this_gen) {
this->buf = NULL;
}
- dpb_flush( &(this->nal_parser->dpb) );
+ dpb_free_all( &(this->nal_parser->dpb) );
if (this->decoder_initialized) {
this->vdpau_accel->vdp_decoder_destroy( this->decoder );
diff --git a/src/libvdpau/vdpau_mpeg12.c b/src/libvdpau/vdpau_mpeg12.c
index 5406bcf5a..fa20f8579 100644
--- a/src/libvdpau/vdpau_mpeg12.c
+++ b/src/libvdpau/vdpau_mpeg12.c
@@ -131,6 +131,7 @@ typedef struct {
uint64_t video_step; /* frame duration in pts units */
double ratio;
VdpDecoderProfile profile;
+ int chroma;
int have_header;
@@ -212,6 +213,7 @@ static void reset_sequence( sequence_t *sequence )
sequence->start = -1;
sequence->seq_pts = sequence->cur_pts = 0;
sequence->profile = VDP_DECODER_PROFILE_MPEG1;
+ sequence->chroma = 0;
//sequence->ratio = 1.0;
sequence->video_step = 3600;
if ( sequence->forward_ref )
@@ -382,6 +384,8 @@ static void sequence_extension( sequence_t *sequence, uint8_t *buf, int len )
}
lprintf( "profile_and_level_indication: %d\n", get_bits( buf,4,8 ) );
lprintf( "progressive_sequence: %d\n", get_bits( buf,12,1 ) );
+ if ( get_bits( buf,13,2 )==2 )
+ sequence->chroma = VO_CHROMA_422;
lprintf( "chroma_format: %d\n", get_bits( buf,13,2 ) );
lprintf( "horizontal_size_extension: %d\n", get_bits( buf,15,2 ) );
lprintf( "vertical_size_extension: %d\n", get_bits( buf,17,2 ) );
@@ -437,6 +441,39 @@ static void picture_coding_extension( sequence_t *sequence, uint8_t *buf, int le
+static void quant_matrix_extension( sequence_t *sequence, uint8_t *buf, int len )
+{
+ int i, j, off;
+
+ i = get_bits( buf,4,1 );
+ lprintf( "load_intra_quantizer_matrix: %d\n", i );
+ if ( i ) {
+ for ( j=0; j<64; ++j ) {
+ sequence->picture.vdp_infos2.intra_quantizer_matrix[mpeg2_scan_norm[j]] = sequence->picture.vdp_infos.intra_quantizer_matrix[mpeg2_scan_norm[j]] = get_bits( buf+j,5,8 );
+ }
+ off = 64;
+ }
+ else {
+ for ( j=0; j<64; ++j ) {
+ sequence->picture.vdp_infos2.intra_quantizer_matrix[mpeg2_scan_norm[j]] = sequence->picture.vdp_infos.intra_quantizer_matrix[mpeg2_scan_norm[j]] = default_intra_quantizer_matrix[j];
+ }
+ }
+
+ i = get_bits( buf+off,5,1 );
+ lprintf( "load_non_intra_quantizer_matrix: %d\n", i );
+ if ( i ) {
+ for ( j=0; j<64; ++j ) {
+ sequence->picture.vdp_infos2.non_intra_quantizer_matrix[mpeg2_scan_norm[j]] = sequence->picture.vdp_infos.non_intra_quantizer_matrix[mpeg2_scan_norm[j]] = get_bits( buf+off+j,6,8 );
+ }
+ }
+ else {
+ memset( sequence->picture.vdp_infos.non_intra_quantizer_matrix, 16, 64 );
+ memset( sequence->picture.vdp_infos2.non_intra_quantizer_matrix, 16, 64 );
+ }
+}
+
+
+
static void copy_slice( sequence_t *sequence, uint8_t *buf, int len )
{
int size = sequence->picture.slices_pos+len;
@@ -454,13 +491,6 @@ static void copy_slice( sequence_t *sequence, uint8_t *buf, int len )
-static void quant_matrix_extension( uint8_t *buf, int len )
-{
- lprintf("quant_matrix_extension >>>>>>>>>>>>>>>>>>>>>>>>>\n");
-}
-
-
-
static int parse_code( vdpau_mpeg12_decoder_t *this_gen, uint8_t *buf, int len )
{
sequence_t *sequence = (sequence_t*)&this_gen->sequence;
@@ -495,7 +525,7 @@ static int parse_code( vdpau_mpeg12_decoder_t *this_gen, uint8_t *buf, int len )
break;
case quant_matrix_ext_sc:
lprintf( " ----------- quant_matrix_extension_start_code\n" );
- quant_matrix_extension( buf+4, len-4 );
+ quant_matrix_extension( sequence, buf+4, len-4 );
break;
case picture_coding_ext_sc:
lprintf( " ----------- picture_coding_extension_start_code\n" );
@@ -554,14 +584,11 @@ static void decode_render( vdpau_mpeg12_decoder_t *vd, vdpau_accel_t *accel )
vd->decoder_height = seq->coded_height;
}
}
- if ( accel->surface==VDP_INVALID_HANDLE ) {
+ /*if ( accel->surface==VDP_INVALID_HANDLE ) {
st = accel->vdp_video_surface_create( accel->vdp_device, VDP_CHROMA_TYPE_420, seq->coded_width, seq->coded_height, &accel->surface);
if ( st!=VDP_STATUS_OK )
lprintf( "failed to create surface !! %s\n", accel->vdp_get_error_string( st ) );
- }
-
- /*if ( pic->vdp_infos.picture_structure!=PICTURE_FRAME && pic->vdp_infos.picture_coding_type==B_FRAME )
- pic->vdp_infos.forward_reference = pic->vdp_infos.backward_reference;*/
+ }*/
VdpBitstreamBuffer vbit;
vbit.struct_version = VDP_BITSTREAM_BUFFER_VERSION;
@@ -648,7 +675,7 @@ static void decode_picture( vdpau_mpeg12_decoder_t *vd )
//printf("vdpau_mpeg12: get image ..\n");
vo_frame_t *img = vd->stream->video_out->get_frame( vd->stream->video_out, seq->coded_width, seq->coded_height,
- seq->ratio, XINE_IMGFMT_VDPAU, VO_BOTH_FIELDS);
+ seq->ratio, XINE_IMGFMT_VDPAU, VO_BOTH_FIELDS|seq->chroma );
vdpau_accel_t *accel = (vdpau_accel_t*)img->accel_data;
if ( !seq->accel_vdpau )
seq->accel_vdpau = accel;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 17:55:27 +0000