Mercurial > mplayer.hg
comparison libmpcodecs/ad_ffmpeg.c @ 23456:1582297cc3d2
Use avcodec_decode_audio2 in ad_ffmpeg.c
author | reimar |
---|---|
date | Tue, 05 Jun 2007 14:12:37 +0000 |
parents | fa99b3d31d13 |
children | c23bbfc21ef6 |
comparison
equal
deleted
inserted
replaced
23455:f6e21317b46b | 23456:1582297cc3d2 |
---|---|
148 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) | 148 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) |
149 { | 149 { |
150 unsigned char *start=NULL; | 150 unsigned char *start=NULL; |
151 int y,len=-1; | 151 int y,len=-1; |
152 while(len<minlen){ | 152 while(len<minlen){ |
153 int len2=0; | 153 int len2=maxlen; |
154 double pts; | 154 double pts; |
155 int x=ds_get_packet_pts(sh_audio->ds,&start, &pts); | 155 int x=ds_get_packet_pts(sh_audio->ds,&start, &pts); |
156 if(x<=0) break; // error | 156 if(x<=0) break; // error |
157 if (pts != MP_NOPTS_VALUE) { | 157 if (pts != MP_NOPTS_VALUE) { |
158 sh_audio->pts = pts; | 158 sh_audio->pts = pts; |
159 sh_audio->pts_bytes = 0; | 159 sh_audio->pts_bytes = 0; |
160 } | 160 } |
161 y=avcodec_decode_audio(sh_audio->context,(int16_t*)buf,&len2,start,x); | 161 y=avcodec_decode_audio2(sh_audio->context,(int16_t*)buf,&len2,start,x); |
162 //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); | 162 //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); |
163 if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } | 163 if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } |
164 if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) | 164 if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) |
165 if(len2>0){ | 165 if(len2>0){ |
166 //len=len2;break; | 166 //len=len2;break; |
167 if(len<0) len=len2; else len+=len2; | 167 if(len<0) len=len2; else len+=len2; |
168 buf+=len2; | 168 buf+=len2; |
169 maxlen -= len2; | |
169 sh_audio->pts_bytes += len2; | 170 sh_audio->pts_bytes += len2; |
170 } | 171 } |
171 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2); | 172 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2); |
172 } | 173 } |
173 return len; | 174 return len; |