mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3/input: rename some variables

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 98666dd735
Author: martii <m4rtii@gmx.de>
Date: 2014-04-10 (Thu, 10 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-10 20:47:44 +02:00
parent 3718731bca
commit c313e41f08
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libeplayer3/input.cpp
View File

@@ -90,6 +90,8 @@ bool Input::Play()
int64_t showtime = 0, bofcount = 0; int64_t showtime = 0, bofcount = 0;
bool restart_audio_resampling = false; bool restart_audio_resampling = false;
int warnAudioWrite = 0;
int warnVideoWrite = 0;
while (player->isPlaying && !player->abortRequested) { while (player->isPlaying && !player->abortRequested) {
@@ -190,8 +192,14 @@ bool Input::Play()
if (_videoTrack && (_videoTrack->pid == pid)) { if (_videoTrack && (_videoTrack->pid == pid)) {
int64_t pts = calcPts(avfc, _videoTrack->stream, packet.pts); int64_t pts = calcPts(avfc, _videoTrack->stream, packet.pts);
if (!player->output.Write(avfc, _videoTrack->stream, &packet, pts)) if (!player->output.Write(avfc, _videoTrack->stream, &packet, pts)) {
fprintf(stderr, "writing data to video device failed\n"); if (warnVideoWrite)
warnVideoWrite--;
else {
fprintf(stderr, "writing data to %s device failed\n", "video");
warnVideoWrite = 100;
}
}
} else if (_audioTrack && (_audioTrack->pid == pid)) { } else if (_audioTrack && (_audioTrack->pid == pid)) {
if (restart_audio_resampling) { if (restart_audio_resampling) {
restart_audio_resampling = false; restart_audio_resampling = false;
@@ -199,8 +207,14 @@ bool Input::Play()
} }
if (!player->isBackWard) { if (!player->isBackWard) {
int64_t pts = calcPts(avfc, _audioTrack->stream, packet.pts); int64_t pts = calcPts(avfc, _audioTrack->stream, packet.pts);
if (!player->output.Write(avfc, _audioTrack->stream, &packet, pts)) if (!player->output.Write(avfc, _audioTrack->stream, &packet, pts)) {
fprintf(stderr, "writing data to audio device failed\n"); if (warnAudioWrite)
warnAudioWrite--;
else {
fprintf(stderr, "writing data to %s device failed\n", "audio");
warnAudioWrite = 100;
}
}
} }
} else if (_subtitleTrack && (_subtitleTrack->pid == pid)) { } else if (_subtitleTrack && (_subtitleTrack->pid == pid)) {
if (((AVStream *) _subtitleTrack->stream)->codec->codec) { if (((AVStream *) _subtitleTrack->stream)->codec->codec) {
@@ -300,20 +314,20 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
return false; return false;
} }
AVPacket avpkt; AVPacket packet;
av_init_packet(&avpkt); av_init_packet(&packet);
if (c->subtitle_header) if (c->subtitle_header)
fprintf(stderr, "%s\n", c->subtitle_header); fprintf(stderr, "%s\n", c->subtitle_header);
while (av_read_frame(subavfc, &avpkt) > -1) { while (av_read_frame(subavfc, &packet) > -1) {
AVSubtitle sub; AVSubtitle sub;
memset(&sub, 0, sizeof(sub)); memset(&sub, 0, sizeof(sub));
int got_sub = 0; int got_sub = 0;
avcodec_decode_subtitle2(c, &sub, &got_sub, &avpkt); avcodec_decode_subtitle2(c, &sub, &got_sub, &packet);
if (got_sub) if (got_sub)
dvbsub_ass_write(c, &sub, pid); dvbsub_ass_write(c, &sub, pid);
av_free_packet(&avpkt); av_free_packet(&packet);
} }
avformat_close_input(&subavfc); avformat_close_input(&subavfc);
avformat_free_context(subavfc); avformat_free_context(subavfc);
@@ -432,7 +446,6 @@ bool Input::UpdateTracks()
else else
track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000.0; track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000.0;
switch (stream->codec->codec_type) { switch (stream->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO: { case AVMEDIA_TYPE_VIDEO: {
player->manager.addVideoTrack(track); player->manager.addVideoTrack(track);