stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

For consistency, also do audio decoding

Browse source 
I doubt it is needed since both AC3 and MPEG2AUDIO can figure out stream details, but lets keep it in there anyway
This commit is contained in:
Andreas Öman 2007-08-12 21:07:44 +00:00
parent 6512bd5a95
commit 7586a7f674
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pvr_rec.c
View file

@ -699,9 +699,10 @@ pwo_writepkt(pvr_rec_t *pvrr, th_subscription_t *s, uint32_t startcode,
AVStream *st, *stx;
AVPacket pkt;
uint8_t *pbuf;
int pbuflen, gotpic;
int pbuflen, data_size;
char txt[100];
const char *tp;
void *abuf;
AVFrame pic;
if(stream_index == -1)
@ -762,10 +763,11 @@ pwo_writepkt(pvr_rec_t *pvrr, th_subscription_t *s, uint32_t startcode,
break;
case CODEC_TYPE_VIDEO:
r = avcodec_decode_video(st->codec, &pic, &gotpic, buf, len);
if(r != 0 && gotpic) {
r = avcodec_decode_video(st->codec, &pic, &data_size, buf, len);
if(r != 0 && data_size) {
syslog(LOG_DEBUG, "pvr: \"%s\" - "
"Stream #%d: Decoded a complete frame: %d x %d in %.2fHz\n",
"Stream #%d: Decoded a complete video frame: "
"%d x %d in %.2fHz\n",
pvrr->pvrr_printname, stream_index,
st->codec->width, st->codec->height,
(float)st->codec->time_base.den /
@ -773,13 +775,27 @@ pwo_writepkt(pvr_rec_t *pvrr, th_subscription_t *s, uint32_t startcode,
pf->pids[streamidx].decoded = 1;
pf->decode_ctd--;
break;
}
break;
case CODEC_TYPE_AUDIO:
pf->pids[streamidx].decoded = 1;
pf->decode_ctd--;
break;
abuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
r = avcodec_decode_audio(st->codec, abuf, &data_size, buf, len);
free(abuf);
if(r != 0 && data_size) {
syslog(LOG_DEBUG, "pvr: \"%s\" - "
"Stream #%d: Decoded a complete audio frame: "
"%d channels in %d Hz\n",
pvrr->pvrr_printname, stream_index,
st->codec->channels,
st->codec->sample_rate);
pf->pids[streamidx].decoded = 1;
pf->decode_ctd--;
}
break;
}
}