frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Cleanup video packet ringbuffer.

Browse Source
This commit is contained in:
Johns 2011-12-26 14:27:12 +01:00
parent 7fbfe0396e
commit baf10db48e
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
softhddev.c
View File

@ -213,11 +213,12 @@ static int VideoMaxPacketSize; ///< biggest used packet buffer
static void VideoPacketInit(void) static void VideoPacketInit(void)
{ {
int i; int i;
AVPacket *avpkt;
Debug(4, "[softhddev]: %s\n", __FUNCTION__); Debug(4, "[softhddev]: %s\n", __FUNCTION__);
for (i = 0; i < VIDEO_PACKET_MAX; ++i) { for (i = 0; i < VIDEO_PACKET_MAX; ++i) {
AVPacket *avpkt;
avpkt = &VideoPacketRb[i]; avpkt = &VideoPacketRb[i];
// build a clean ffmpeg av packet // build a clean ffmpeg av packet
if (av_new_packet(avpkt, VIDEO_BUFFER_SIZE)) { if (av_new_packet(avpkt, VIDEO_BUFFER_SIZE)) {
@ -229,8 +230,32 @@ static void VideoPacketInit(void)
atomic_set(&VideoPacketsFilled, 0); atomic_set(&VideoPacketsFilled, 0);
} }
/**
** Cleanup video packet ringbuffer.
*/
static void VideoPacketExit(void)
{
int i;
Debug(4, "[softhddev]: %s\n", __FUNCTION__);
atomic_set(&VideoPacketsFilled, 0);
for (i = 0; i < VIDEO_PACKET_MAX; ++i) {
AVPacket *avpkt;
avpkt = &VideoPacketRb[i];
// build a clean ffmpeg av packet
av_free_packet(avpkt);
}
}
/** /**
** Place video data in packet ringbuffer. ** Place video data in packet ringbuffer.
**
** @param pts presentation timestamp of pes packet
** @param data data of pes packet
** @param data size of pes packet
*/ */
static void VideoEnqueue(int64_t pts, const void *data, int size) static void VideoEnqueue(int64_t pts, const void *data, int size)
{ {
@ -242,18 +267,16 @@ static void VideoEnqueue(int64_t pts, const void *data, int size)
if (!avpkt->stream_index) { // add pts only for first added if (!avpkt->stream_index) { // add pts only for first added
avpkt->pts = pts; avpkt->pts = pts;
} }
if (avpkt->stream_index + size + FF_INPUT_BUFFER_PADDING_SIZE >= if (avpkt->stream_index + size >= avpkt->size) {
avpkt->size) {
Warning(_("video: packet buffer too small for %d\n"), Warning(_("video: packet buffer too small for %d\n"),
avpkt->stream_index + size + FF_INPUT_BUFFER_PADDING_SIZE); avpkt->stream_index + size);
av_grow_packet(avpkt, // new + grow reserves FF_INPUT_BUFFER_PADDING_SIZE
((size + FF_INPUT_BUFFER_PADDING_SIZE + VIDEO_BUFFER_SIZE / 2) av_grow_packet(avpkt, ((size + VIDEO_BUFFER_SIZE / 2)
/ (VIDEO_BUFFER_SIZE / 2)) * (VIDEO_BUFFER_SIZE / 2)); / (VIDEO_BUFFER_SIZE / 2)) * (VIDEO_BUFFER_SIZE / 2));
#ifdef DEBUG #ifdef DEBUG
if (avpkt->size < if (avpkt->size <= avpkt->stream_index + size ) {
avpkt->stream_index + size + FF_INPUT_BUFFER_PADDING_SIZE) {
abort(); abort();
} }
#endif #endif
@ -444,6 +467,7 @@ int PlayVideo(const uint8_t * data, int size)
Debug(3, "video: new stream %d\n", GetMsTicks() - VideoSwitch); Debug(3, "video: new stream %d\n", GetMsTicks() - VideoSwitch);
// FIXME: hack to test results // FIXME: hack to test results
if (atomic_read(&VideoPacketsFilled) >= VIDEO_PACKET_MAX - 1) { if (atomic_read(&VideoPacketsFilled) >= VIDEO_PACKET_MAX - 1) {
Debug(3, "video: new video stream lost\n");
NewVideoStream = 0; NewVideoStream = 0;
return 0; return 0;
} }
@ -452,7 +476,7 @@ int PlayVideo(const uint8_t * data, int size)
NewVideoStream = 0; NewVideoStream = 0;
} }
// must be a PES start code // must be a PES start code
if (size < 9 || data[0] || data[1] || data[2] != 0x01) { if (size < 9 || !data || data[0] || data[1] || data[2] != 0x01) {
Error(_("[softhddev] invalid PES video packet\n")); Error(_("[softhddev] invalid PES video packet\n"));
return size; return size;
} }
@ -867,6 +891,7 @@ void Stop(void)
VideoExit(); VideoExit();
AudioExit(); AudioExit();
CodecExit(); CodecExit();
VideoPacketExit();
if (StartX11Server) { if (StartX11Server) {
Debug(3, "x-setup: Stop x11 server\n"); Debug(3, "x-setup: Stop x11 server\n");