Comment fix in the avformatdecoder header
From: Erik Hovland <erik@hovland.org>
---
libs/libmythtv/avformatdecoder.cpp | 12 ++++++------
libs/libmythtv/avformatdecoder.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libs/libmythtv/avformatdecoder.cpp b/libs/libmythtv/avformatdecoder.cpp
index bcd3cd6..ecee4d0 100644
a
|
b
|
static void myth_av_log(void *ptr, int level, const char* fmt, va_list vl) |
92 | 92 | |
93 | 93 | char str[msg_len+1]; |
94 | 94 | int bytes = vsnprintf(str, msg_len+1, fmt, vl); |
95 | | // check for truncted messages and fix them |
| 95 | // check for truncated messages and fix them |
96 | 96 | if (bytes > msg_len) |
97 | 97 | { |
98 | 98 | VERBOSE(VB_IMPORTANT, QString("Libav log output truncated %1 of %2 bytes written") |
… |
… |
extern "C" void HandleStreamChange(void* data) { |
844 | 844 | * |
845 | 845 | * \param rbuffer pointer to a valid ringuffer. |
846 | 846 | * \param novideo if true then no video is sought in ScanSreams. |
847 | | * \param testbuf this paramater is not used by AvFormatDecoder. |
| 847 | * \param testbuf this parameter is not used by AvFormatDecoder. |
848 | 848 | */ |
849 | 849 | int AvFormatDecoder::OpenFile(RingBuffer *rbuffer, bool novideo, |
850 | 850 | char testbuf[kDecoderProbeBufferSize], |
… |
… |
int AvFormatDecoder::OpenFile(RingBuffer *rbuffer, bool novideo, |
970 | 970 | } |
971 | 971 | else |
972 | 972 | { |
973 | | // the pvr-250 seems to overreport the bitrate by * 2 |
| 973 | // the pvr-250 seems to over report the bitrate by * 2 |
974 | 974 | float bytespersec = (float)bitrate / 8 / 2; |
975 | 975 | float secs = ringBuffer->GetRealFileSize() * 1.0 / bytespersec; |
976 | 976 | GetNVP()->SetFileLength((int)(secs), (int)(secs * fps)); |
… |
… |
bool AvFormatDecoder::HasVideo(const AVFormatContext *ic) |
3845 | 3845 | // will ignore other uses of the same stream id in DVB countries. |
3846 | 3846 | has_video |= pmt.IsVideo(i, "dvb"); |
3847 | 3847 | |
3848 | | // MHEG may explictly select a private stream as video |
| 3848 | // MHEG may explicitly select a private stream as video |
3849 | 3849 | has_video |= ((i == (uint)selectedVideoIndex) && |
3850 | 3850 | (pmt.StreamType(i) == StreamID::PrivData)); |
3851 | 3851 | } |
… |
… |
void *AvFormatDecoder::GetVideoCodecPrivate(void) |
3926 | 3926 | |
3927 | 3927 | void AvFormatDecoder::SetDisablePassThrough(bool disable) |
3928 | 3928 | { |
3929 | | // can only disable never reenable as once |
| 3929 | // can only disable never re-enable as once |
3930 | 3930 | // timestretch is on its on for the session |
3931 | 3931 | if (disable_passthru) |
3932 | 3932 | return; |
… |
… |
bool AvFormatDecoder::SetupAudioStream(void) |
4019 | 4019 | |
4020 | 4020 | GetNVP()->SetAudioParams(digInfo.bps(), digInfo.channels, |
4021 | 4021 | digInfo.sample_rate, audioIn.do_passthru); |
4022 | | // allow the audio stuff to reencode |
| 4022 | // allow the audio stuff to re-encode |
4023 | 4023 | GetNVP()->SetAudioCodec(codec_ctx); |
4024 | 4024 | GetNVP()->ReinitAudio(); |
4025 | 4025 | return true; |
diff --git a/libs/libmythtv/avformatdecoder.h b/libs/libmythtv/avformatdecoder.h
index af93a43..426af5d 100644
a
|
b
|
class AudioInfo |
79 | 79 | /// A decoder for video files. |
80 | 80 | |
81 | 81 | /// The AvFormatDecoder is used to decode non-NuppleVideo files. |
82 | | /// It's used a a decoder of last resort after trying the NuppelDecoder |
| 82 | /// It's used as a decoder of last resort after trying the NuppelDecoder |
83 | 83 | /// and IvtvDecoder (if "USING_IVTV" is defined). |
84 | 84 | class AvFormatDecoder : public DecoderBase |
85 | 85 | { |
… |
… |
class AvFormatDecoder : public DecoderBase |
184 | 184 | void InitVideoCodec(AVStream *stream, AVCodecContext *enc, |
185 | 185 | bool selectedStream = false); |
186 | 186 | |
187 | | /// Preprocess a packet, setting the video parms if nessesary. |
| 187 | /// Preprocess a packet, setting the video parms if necessary. |
188 | 188 | void MpegPreProcessPkt(AVStream *stream, AVPacket *pkt); |
189 | 189 | void H264PreProcessPkt(AVStream *stream, AVPacket *pkt); |
190 | 190 | |