i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dvb.media_addon: Code cleanup and some coding style.

Browse Source 
- Remove use of now superflous media_header_ex structure.

- Respect 80 char line limit and indentation rules. Coding style only applied
  to functions raw_[audio|video]_thread, rest of the class may need some more
  cleanup.

- No functional change intended.
This commit is contained in:
Colin Günther
2014-08-10 14:50:53 +02:00
parent a90155a41a
commit b93146243f
2 changed files with 104 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
+104 -68
View File
@@ -49,7 +49,6 @@
#include "Packet.h" #include "Packet.h"
#include "PacketQueue.h" #include "PacketQueue.h"
#include "pes.h" #include "pes.h"
#include "media_header_ex.h"
#include "config.h" #include "config.h"
//#define DUMP_VIDEO //#define DUMP_VIDEO
@@ -1563,12 +1562,12 @@ DVBMediaNode::raw_audio_thread()
// decode data and send buffers // decode data and send buffers
delete fBufferGroupRawAudio; delete fBufferGroupRawAudio;
fBufferGroupRawAudio = new BBufferGroup(fOutputRawAudio.format.u.raw_audio.buffer_size * 3, 25); fBufferGroupRawAudio = new BBufferGroup(
fOutputRawAudio.format.u.raw_audio.buffer_size * 3, 25);
while (!fTerminateThreads) { while (!fTerminateThreads) {
int64 frameCount; int64 frameCount;
media_header mh; media_header mh;
media_header_ex *mhe = (media_header_ex *)&mh;
if (!fOutputEnabledRawAudio) { if (!fOutputEnabledRawAudio) {
fRawAudioQueue->Flush(40000); fRawAudioQueue->Flush(40000);
@@ -1576,7 +1575,9 @@ DVBMediaNode::raw_audio_thread()
} }
BBuffer* buf; BBuffer* buf;
buf = fBufferGroupRawAudio->RequestBuffer(fOutputRawAudio.format.u.raw_audio.buffer_size, AUDIO_BUFFER_REQUEST_TIMEOUT); buf = fBufferGroupRawAudio->RequestBuffer(
fOutputRawAudio.format.u.raw_audio.buffer_size,
AUDIO_BUFFER_REQUEST_TIMEOUT);
if (!buf) { if (!buf) {
TRACE("audio: request buffer timout\n"); TRACE("audio: request buffer timout\n");
continue; continue;
@@ -1591,24 +1592,32 @@ DVBMediaNode::raw_audio_thread()
#ifdef DUMP_RAW_AUDIO #ifdef DUMP_RAW_AUDIO
lock.Lock(); lock.Lock();
write(fRawAudioFile, buf->Data(), mhe->size_used); write(fRawAudioFile, buf->Data(), mh.size_used);
lock.Unlock(); lock.Unlock();
#endif #endif
if ( fOutputRawAudio.format.u.raw_audio.buffer_size != mhe->size_used if (fOutputRawAudio.format.u.raw_audio.buffer_size != mh.size_used
|| int(fOutputRawAudio.format.u.raw_audio.frame_rate) != mhe->u.raw_audio.frame_rate || int(fOutputRawAudio.format.u.raw_audio.frame_rate)
|| fOutputRawAudio.format.u.raw_audio.channel_count != mhe->u.raw_audio.channel_count != mh.u.raw_audio.frame_rate
) { || fOutputRawAudio.format.u.raw_audio.channel_count
TRACE("audio: decode format change: changed buffer_size from %ld to %ld\n", fOutputRawAudio.format.u.raw_audio.buffer_size, mhe->size_used); != mh.u.raw_audio.channel_count) {
TRACE("audio: decode format change: changed channel_count from %ld to %ld\n", fOutputRawAudio.format.u.raw_audio.channel_count, mhe->u.raw_audio.channel_count); TRACE("audio: decode format change: changed buffer_size from %ld"
TRACE("audio: decode format change: changed frame_rate from %.0f to %.0f\n", fOutputRawAudio.format.u.raw_audio.frame_rate, mhe->u.raw_audio.frame_rate); " to %ld\n", fOutputRawAudio.format.u.raw_audio.buffer_size,
fOutputRawAudio.format.u.raw_audio.buffer_size = mhe->size_used; mh.size_used);
fOutputRawAudio.format.u.raw_audio.frame_rate = mhe->u.raw_audio.frame_rate; TRACE("audio: decode format change: changed channel_count from %ld"
fOutputRawAudio.format.u.raw_audio.channel_count = mhe->u.raw_audio.channel_count; " to %ld\n", fOutputRawAudio.format.u.raw_audio.channel_count,
mh.u.raw_audio.channel_count);
TRACE("audio: decode format change: changed frame_rate from %.0f"
" to %.0f\n", fOutputRawAudio.format.u.raw_audio.frame_rate,
mh.u.raw_audio.frame_rate);
fOutputRawAudio.format.u.raw_audio.buffer_size = mh.size_used;
fOutputRawAudio.format.u.raw_audio.frame_rate
= mh.u.raw_audio.frame_rate;
fOutputRawAudio.format.u.raw_audio.channel_count
= mh.u.raw_audio.channel_count;
lock.Lock(); lock.Lock();
err = ChangeFormat(fOutputRawAudio.source, err = ChangeFormat(fOutputRawAudio.source,
fOutputRawAudio.destination, fOutputRawAudio.destination, &fOutputRawAudio.format);
&fOutputRawAudio.format);
lock.Unlock(); lock.Unlock();
printf("format change result %lx (%s)\n", err, strerror(err)); printf("format change result %lx (%s)\n", err, strerror(err));
PrintFormat(fOutputRawAudio.format); PrintFormat(fOutputRawAudio.format);
@@ -1628,7 +1637,7 @@ DVBMediaNode::raw_audio_thread()
fDemux->TimesourceInfo(&ts_perf_time, &ts_sys_time); fDemux->TimesourceInfo(&ts_perf_time, &ts_sys_time);
ts_offset = ts_sys_time - ts_perf_time; ts_offset = ts_sys_time - ts_perf_time;
aud_time = mhe->start_time; // measured in PCR time base aud_time = mh.start_time; // measured in PCR time base
start_time = TimeSource()->PerformanceTimeFor(aud_time + ts_offset); start_time = TimeSource()->PerformanceTimeFor(aud_time + ts_offset);
// calculate delay and wait // calculate delay and wait
@@ -1637,42 +1646,45 @@ DVBMediaNode::raw_audio_thread()
delay = start_time - TimeSource()->Now(); delay = start_time - TimeSource()->Now();
TRACE_TIMING("audio delay is %Ld\n", delay); TRACE_TIMING("audio delay is %Ld\n", delay);
if (delay < -AUDIO_MAX_LATE) { if (delay < -AUDIO_MAX_LATE) {
printf("audio: decoded packet is %Ldms too late, dropped\n", -delay / 1000); printf("audio: decoded packet is %Ldms too late, dropped\n",
-delay / 1000);
buf->Recycle(); buf->Recycle();
continue; continue;
} }
if (delay < 0) { if (delay < 0)
// printf("audio: decoded packet is %Ldms too late\n", -delay / 1000); // printf("audio: decoded packet is %Ldms too late\n", -delay / 1000);
}
if (delay > AUDIO_MAX_EARLY) { if (delay > AUDIO_MAX_EARLY) {
printf("audio: decoded packet is %Ldms too early, dropped\n", delay / 1000); printf("audio: decoded packet is %Ldms too early, dropped\n",
delay / 1000);
buf->Recycle(); buf->Recycle();
continue; continue;
} }
if (delay > 0) { if (delay > 0)
// printf("audio: decoded packet is %Ldms too early\n", delay / 1000); // printf("audio: decoded packet is %Ldms too early\n", delay / 1000);
}
delay -= PROCESSING_LATENCY; delay -= PROCESSING_LATENCY;
if (delay > 0) { if (delay > 0) {
if (acquire_sem_etc(fAudioDelaySem, 1, B_RELATIVE_TIMEOUT, delay) != B_TIMED_OUT) { if (acquire_sem_etc(fAudioDelaySem, 1, B_RELATIVE_TIMEOUT, delay)
!= B_TIMED_OUT) {
printf("audio: delay sem not timed out, dropped packet\n"); printf("audio: delay sem not timed out, dropped packet\n");
buf->Recycle(); buf->Recycle();
continue; continue;
} }
} }
TRACE_TIMING("audio playback delay %Ld\n", start_time - TimeSource()->Now()); TRACE_TIMING("audio playback delay %Ld\n",
start_time - TimeSource()->Now());
media_header* hdr; media_header* hdr;
hdr = buf->Header(); hdr = buf->Header();
// *hdr = mh; // copy header from decoded frame
hdr->type = B_MEDIA_RAW_AUDIO; hdr->type = B_MEDIA_RAW_AUDIO;
hdr->size_used = mhe->size_used; hdr->size_used = mh.size_used;
hdr->time_source = TimeSource()->ID(); // set time source id hdr->time_source = TimeSource()->ID();
hdr->start_time = start_time; // set start time hdr->start_time = start_time;
lock.Lock(); lock.Lock();
if (SendBuffer(buf, fOutputRawAudio.source, fOutputRawAudio.destination) if (SendBuffer(buf, fOutputRawAudio.source,
!= B_OK) { fOutputRawAudio.destination) != B_OK) {
TRACE("audio: sending buffer failed\n"); TRACE("audio: sending buffer failed\n");
buf->Recycle(); buf->Recycle();
} }
@@ -1751,14 +1763,13 @@ DVBMediaNode::raw_video_thread()
while (!fTerminateThreads) { while (!fTerminateThreads) {
int64 frameCount; int64 frameCount;
media_header mh; media_header mh;
media_header_ex *mhe = (media_header_ex *)&mh;
if (!fOutputEnabledRawVideo) { if (!fOutputEnabledRawVideo) {
fRawVideoQueue->Flush(40000); fRawVideoQueue->Flush(40000);
continue; continue;
} }
// fetch a new buffer (always of maximum size, as the stream may change) // fetch a new buffer (always of maximum size as the stream may change)
BBuffer* buf; BBuffer* buf;
buf = fBufferGroupRawVideo->RequestBuffer(video_buffer_size_max, buf = fBufferGroupRawVideo->RequestBuffer(video_buffer_size_max,
@@ -1779,38 +1790,61 @@ DVBMediaNode::raw_video_thread()
// check if the format of the stream has changed // check if the format of the stream has changed
if ( mhe->u.raw_video.display_line_width != fOutputRawVideo.format.u.raw_video.display.line_width if (mh.u.raw_video.display_line_width
|| mhe->u.raw_video.display_line_count != fOutputRawVideo.format.u.raw_video.display.line_count != fOutputRawVideo.format.u.raw_video.display.line_width
|| mhe->u.raw_video.bytes_per_row != fOutputRawVideo.format.u.raw_video.display.bytes_per_row || mh.u.raw_video.display_line_count
|| mhe->u.raw_video.pixel_width_aspect != fOutputRawVideo.format.u.raw_video.pixel_width_aspect != fOutputRawVideo.format.u.raw_video.display.line_count
|| mhe->u.raw_video.pixel_height_aspect != fOutputRawVideo.format.u.raw_video.pixel_height_aspect || mh.u.raw_video.bytes_per_row
|| mhe->size_used != video_buffer_size) != fOutputRawVideo.format.u.raw_video.display.bytes_per_row
{ || mh.u.raw_video.pixel_width_aspect
!= fOutputRawVideo.format.u.raw_video.pixel_width_aspect
|| mh.u.raw_video.pixel_height_aspect
!= fOutputRawVideo.format.u.raw_video.pixel_height_aspect
|| mh.size_used != video_buffer_size) {
printf("video format changed:\n"); printf("video format changed:\n");
printf(" line_width %ld => %ld\n", fOutputRawVideo.format.u.raw_video.display.line_width, mhe->u.raw_video.display_line_width); printf(" line_width %ld => %ld\n",
printf(" line_count %ld => %ld\n", fOutputRawVideo.format.u.raw_video.display.line_count, mhe->u.raw_video.display_line_count); fOutputRawVideo.format.u.raw_video.display.line_width,
printf(" bytes_per_row %ld => %ld\n", fOutputRawVideo.format.u.raw_video.display.bytes_per_row, mhe->u.raw_video.bytes_per_row); mh.u.raw_video.display_line_width);
printf(" pixel_width_aspect %d => %d\n", fOutputRawVideo.format.u.raw_video.pixel_width_aspect, mhe->u.raw_video.pixel_width_aspect); printf(" line_count %ld => %ld\n",
printf(" pixel_height_aspect %d => %d\n", fOutputRawVideo.format.u.raw_video.pixel_width_aspect, mhe->u.raw_video.pixel_height_aspect); fOutputRawVideo.format.u.raw_video.display.line_count,
printf(" pixel_height_aspect %d => %d\n", fOutputRawVideo.format.u.raw_video.pixel_width_aspect, mhe->u.raw_video.pixel_height_aspect); mh.u.raw_video.display_line_count);
printf(" video_buffer_size %ld => %ld\n", video_buffer_size, mhe->size_used); printf(" bytes_per_row %ld => %ld\n",
fOutputRawVideo.format.u.raw_video.display.bytes_per_row,
mh.u.raw_video.bytes_per_row);
printf(" pixel_width_aspect %d => %d\n",
fOutputRawVideo.format.u.raw_video.pixel_width_aspect,
mh.u.raw_video.pixel_width_aspect);
printf(" pixel_height_aspect %d => %d\n",
fOutputRawVideo.format.u.raw_video.pixel_width_aspect,
mh.u.raw_video.pixel_height_aspect);
printf(" pixel_height_aspect %d => %d\n",
fOutputRawVideo.format.u.raw_video.pixel_width_aspect,
mh.u.raw_video.pixel_height_aspect);
printf(" video_buffer_size %ld => %ld\n", video_buffer_size,
mh.size_used);
// recalculate video buffer size // recalculate video buffer size
// video_buffer_size = mhe->size_used; video_buffer_size
video_buffer_size = fOutputRawVideo.format.u.raw_video.display.line_count * fOutputRawVideo.format.u.raw_video.display.bytes_per_row; = fOutputRawVideo.format.u.raw_video.display.line_count
* fOutputRawVideo.format.u.raw_video.display.bytes_per_row;
// perform a video format change // perform a video format change
fOutputRawVideo.format.u.raw_video.display.line_width = mhe->u.raw_video.display_line_width; fOutputRawVideo.format.u.raw_video.display.line_width
fOutputRawVideo.format.u.raw_video.display.line_count = mhe->u.raw_video.display_line_count; = mh.u.raw_video.display_line_width;
fOutputRawVideo.format.u.raw_video.display.bytes_per_row = mhe->u.raw_video.bytes_per_row; fOutputRawVideo.format.u.raw_video.display.line_count
fOutputRawVideo.format.u.raw_video.pixel_width_aspect = mhe->u.raw_video.pixel_width_aspect; = mh.u.raw_video.display_line_count;
fOutputRawVideo.format.u.raw_video.pixel_width_aspect = mhe->u.raw_video.pixel_height_aspect; fOutputRawVideo.format.u.raw_video.display.bytes_per_row
fOutputRawVideo.format.u.raw_video.last_active = mhe->u.raw_video.display_line_count - 1; = mh.u.raw_video.bytes_per_row;
fOutputRawVideo.format.u.raw_video.pixel_width_aspect
= mh.u.raw_video.pixel_width_aspect;
fOutputRawVideo.format.u.raw_video.pixel_width_aspect
= mh.u.raw_video.pixel_height_aspect;
fOutputRawVideo.format.u.raw_video.last_active
= mh.u.raw_video.display_line_count - 1;
lock.Lock(); lock.Lock();
err = ChangeFormat(fOutputRawVideo.source, err = ChangeFormat(fOutputRawVideo.source,
fOutputRawVideo.destination, fOutputRawVideo.destination, &fOutputRawVideo.format);
&fOutputRawVideo.format);
lock.Unlock(); lock.Unlock();
printf("format change result %lx (%s)\n", err, strerror(err)); printf("format change result %lx (%s)\n", err, strerror(err));
PrintFormat(fOutputRawVideo.format); PrintFormat(fOutputRawVideo.format);
@@ -1831,7 +1865,7 @@ DVBMediaNode::raw_video_thread()
fDemux->TimesourceInfo(&ts_perf_time, &ts_sys_time); fDemux->TimesourceInfo(&ts_perf_time, &ts_sys_time);
ts_offset = ts_sys_time - ts_perf_time; ts_offset = ts_sys_time - ts_perf_time;
pic_time = mhe->start_time; // measured in PCR time base pic_time = mh.start_time; // measured in PCR time base
start_time = TimeSource()->PerformanceTimeFor(pic_time + ts_offset); start_time = TimeSource()->PerformanceTimeFor(pic_time + ts_offset);
// calculate delay and wait // calculate delay and wait
@@ -1840,41 +1874,43 @@ DVBMediaNode::raw_video_thread()
delay = start_time - TimeSource()->Now(); delay = start_time - TimeSource()->Now();
TRACE_TIMING("video delay %Ld\n", delay); TRACE_TIMING("video delay %Ld\n", delay);
if (delay < -VIDEO_MAX_LATE) { if (delay < -VIDEO_MAX_LATE) {
printf("video: decoded packet is %Ldms too late, dropped\n", -delay / 1000); printf("video: decoded packet is %Ldms too late, dropped\n",
-delay / 1000);
buf->Recycle(); buf->Recycle();
continue; continue;
} }
if (delay > VIDEO_MAX_EARLY) { if (delay > VIDEO_MAX_EARLY) {
printf("video: decoded packet is %Ldms too early, dropped\n", delay / 1000); printf("video: decoded packet is %Ldms too early, dropped\n",
delay / 1000);
buf->Recycle(); buf->Recycle();
continue; continue;
} }
delay -= PROCESSING_LATENCY; delay -= PROCESSING_LATENCY;
if (delay > 0) { if (delay > 0) {
if (acquire_sem_etc(fVideoDelaySem, 1, B_RELATIVE_TIMEOUT, delay) != B_TIMED_OUT) { if (acquire_sem_etc(fVideoDelaySem, 1, B_RELATIVE_TIMEOUT, delay)
!= B_TIMED_OUT) {
printf("video: delay sem not timed out, dropped packet\n"); printf("video: delay sem not timed out, dropped packet\n");
buf->Recycle(); buf->Recycle();
continue; continue;
} }
} }
TRACE_TIMING("video playback delay %Ld\n", start_time - TimeSource()->Now()); TRACE_TIMING("video playback delay %Ld\n", start_time
- TimeSource()->Now());
media_header* hdr; media_header* hdr;
hdr = buf->Header(); hdr = buf->Header();
// *hdr = mh; // copy header from decoded frame
hdr->type = B_MEDIA_RAW_VIDEO; hdr->type = B_MEDIA_RAW_VIDEO;
hdr->size_used = video_buffer_size; hdr->size_used = video_buffer_size;
hdr->time_source = TimeSource()->ID(); // set time source id hdr->time_source = TimeSource()->ID();
hdr->start_time = start_time; // set start time hdr->start_time = start_time;
lock.Lock(); lock.Lock();
if (SendBuffer(buf, fOutputRawVideo.source, fOutputRawVideo.destination) if (SendBuffer(buf, fOutputRawVideo.source, fOutputRawVideo.destination)
!= B_OK) { != B_OK) {
TRACE("video: sending buffer failed\n"); TRACE("video: sending buffer failed\n");
buf->Recycle(); buf->Recycle();
} }
lock.Unlock(); lock.Unlock();
} }
delete fCurrentVideoPacket; delete fCurrentVideoPacket;
src/add-ons/media/media-add-ons/dvb/media_header_ex.h
-79
View File
@@ -1,79 +0,0 @@
/*
* Copyright (c) 2004-2007 Marcus Overhagen <[email protected]>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify,
* merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __MEDIA_HEADER_EX_H_
#define __MEDIA_HEADER_EX_H_
#include <MediaDefs.h>
struct media_audio_header_ex {
int32 _reserved_[13];
float frame_rate; // NEW!
uint32 channel_count; // NEW!
} _PACKED;
struct media_video_header_ex {
uint32 _reserved_[8];
uint32 display_line_width; // NEW!
uint32 display_line_count; // NEW!
uint32 bytes_per_row; // NEW!
uint16 pixel_width_aspect; // NEW!
uint16 pixel_height_aspect; // NEW!
float field_gamma;
uint32 field_sequence;
uint16 field_number;
uint16 pulldown_number;
uint16 first_active_line;
uint16 line_count;
} _PACKED;
struct media_header_ex {
media_type type;
media_buffer_id buffer;
int32 destination;
media_node_id time_source;
uint32 _reserved1_;
uint32 size_used;
bigtime_t start_time;
area_id owner;
type_code user_data_type;
uchar user_data[64];
uint32 _reserved2_[2];
off_t file_pos;
size_t orig_size;
uint32 data_offset;
union {
media_audio_header_ex raw_audio;
media_video_header_ex raw_video;
media_multistream_header multistream;
media_encoded_audio_header encoded_audio;
media_encoded_video_header encoded_video;
char _reserved_[64];
} u;
};
#endif