@@ -140,7 +140,7 @@ VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder * hw_decoder)
140
140
VideoDecoder * decoder ;
141
141
142
142
if (!(decoder = calloc (1 , sizeof (* decoder )))) {
143
- Fatal ("codec: can't allocate vodeo decoder" );
143
+ Fatal ("codec: can't allocate vídeo decoder" );
144
144
}
145
145
146
146
av_register_all ();
@@ -199,7 +199,7 @@ void CodecVideoOpen(VideoDecoder * decoder)
199
199
codec_id = AV_CODEC_ID_MPEG2VIDEO ;
200
200
break ;
201
201
202
- case 0x1b : /* FALLTHRU */
202
+ case 0x1B : /* FALLTHRU */
203
203
case 0x20 :
204
204
codec_id = AV_CODEC_ID_H264 ;
205
205
break ;
@@ -209,7 +209,7 @@ void CodecVideoOpen(VideoDecoder * decoder)
209
209
break ;
210
210
211
211
default :
212
- Fatal ("codec: unknown vtype: 0x%x" , device_get_vtype ());
212
+ Error ("codec: unknown vtype: 0x%x" , device_get_vtype ());
213
213
break ;
214
214
}
215
215
@@ -250,15 +250,15 @@ void CodecVideoOpen(VideoDecoder * decoder)
250
250
251
251
ret = avformat_find_stream_info (decoder -> VideoFmtCtx , NULL );
252
252
if (ret < 0 ) {
253
- Error ("codec: can't find stream info: %s" , av_err2str (ret ));
253
+ Error ("codec: can't find video stream info: %s" , av_err2str (ret ));
254
254
goto error_avformat_find_stream_info ;
255
255
}
256
256
257
257
av_dump_format (decoder -> VideoFmtCtx , 0 , "vaapidevice video" , 0 );
258
258
259
259
ret = av_find_best_stream (decoder -> VideoFmtCtx , AVMEDIA_TYPE_VIDEO , -1 , -1 , & video_codec , 0 );
260
260
if (ret < 0 ) {
261
- Error ("codec: can't find best stream: %s" , av_err2str (ret ));
261
+ Error ("codec: can't find best video stream: %s" , av_err2str (ret ));
262
262
goto error_avformat_find_best_stream ;
263
263
}
264
264
decoder -> VideoCodec = video_codec ;
@@ -564,18 +564,32 @@ void CodecAudioOpen(AudioDecoder * audio_decoder, int codec_id_old)
564
564
pthread_mutex_lock (& CodecLockMutex );
565
565
566
566
switch (device_get_atype ()) {
567
+ case -1 :
568
+ goto error_avformat_alloc_context ;
569
+ break ;
567
570
case 0 :
568
571
break ;
569
572
case 0x3 : /* FALLTHRU */
570
573
case 0x4 :
571
574
codec_id = AV_CODEC_ID_MP2 ;
572
575
break ;
573
-
574
- case 0x6a :
576
+ case 0x6A :
575
577
codec_id = AV_CODEC_ID_AC3 ;
576
578
break ;
579
+ case 0x6 :
580
+ case 0x7A :
581
+ codec_id = AV_CODEC_ID_EAC3 ;
582
+ break ;
583
+ case 0x7B :
584
+ codec_id = AV_CODEC_ID_DTS ;
585
+ break ;
586
+ case 0xF :
587
+ case 0x11 :
588
+ case 0x7C :
589
+ codec_id = AV_CODEC_ID_AAC ;
590
+ break ;
577
591
default :
578
- Fatal ("Unknown atype: 0x%x" , device_get_atype ());
592
+ Error ("Unknown atype: 0x%x" , device_get_atype ());
579
593
break ;
580
594
}
581
595
0 commit comments