mirror of
https://github.com/mpv-player/mpv
synced 2025-02-18 05:37:04 +00:00
None of the calling sites to stream_write_buffer were checking the return value to see if all bytes got written (nothing in current code actually calls it any more after MEncoder was removed). This was causing (very occasionally) problems with mencoder when using output pipes AND running under a sandbox or when being straced (ptrace is the culprit). Theoretically this problem can happen without pipes or ptrace. Only stream_file, stream_smb and stream_ffmpeg implement write_buffer and ffmpeg already handles this internally. Original patch by Sang-Uok Kum. Signed-off-by: Tobias Diedrich <ranma@google.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32881 b3059339-0415-0410-9bf9-f77b7e298cf2
154 lines
3.9 KiB
C
154 lines
3.9 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "libavformat/avformat.h"
|
|
#include "libavformat/avio.h"
|
|
#include "mp_msg.h"
|
|
#include "stream.h"
|
|
#include "m_option.h"
|
|
#include "m_struct.h"
|
|
#include "libmpdemux/demuxer.h"
|
|
|
|
static int fill_buffer(stream_t *s, char *buffer, int max_len)
|
|
{
|
|
int r = url_read_complete(s->priv, buffer, max_len);
|
|
return (r <= 0) ? -1 : r;
|
|
}
|
|
|
|
static int write_buffer(stream_t *s, char *buffer, int len)
|
|
{
|
|
/* url_write retries internally on short writes and EAGAIN */
|
|
int r = url_write(s->priv, buffer, len);
|
|
return (r <= 0) ? -1 : r;
|
|
}
|
|
|
|
static int seek(stream_t *s, off_t newpos)
|
|
{
|
|
s->pos = newpos;
|
|
if (url_seek(s->priv, s->pos, SEEK_SET) < 0) {
|
|
s->eof = 1;
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static int control(stream_t *s, int cmd, void *arg)
|
|
{
|
|
int64_t size, ts;
|
|
double pts;
|
|
switch(cmd) {
|
|
case STREAM_CTRL_GET_SIZE:
|
|
size = url_filesize(s->priv);
|
|
if(size >= 0) {
|
|
*(off_t *)arg = size;
|
|
return 1;
|
|
}
|
|
break;
|
|
case STREAM_CTRL_SEEK_TO_TIME:
|
|
pts = *(double *)arg;
|
|
ts = pts * AV_TIME_BASE;
|
|
ts = av_url_read_seek(s->priv, -1, ts, 0);
|
|
if (ts >= 0)
|
|
return 1;
|
|
break;
|
|
}
|
|
return STREAM_UNSUPPORTED;
|
|
}
|
|
|
|
static void close_f(stream_t *stream)
|
|
{
|
|
url_close(stream->priv);
|
|
}
|
|
|
|
static const char prefix[] = "ffmpeg://";
|
|
|
|
static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
|
|
{
|
|
int flags = 0;
|
|
const char *filename;
|
|
URLContext *ctx = NULL;
|
|
int res = STREAM_ERROR;
|
|
int64_t size;
|
|
int dummy;
|
|
|
|
av_register_all();
|
|
if (mode == STREAM_READ)
|
|
flags = URL_RDONLY;
|
|
else if (mode == STREAM_WRITE)
|
|
flags = URL_WRONLY;
|
|
else {
|
|
mp_msg(MSGT_OPEN, MSGL_ERR, "[ffmpeg] Unknown open mode %d\n", mode);
|
|
res = STREAM_UNSUPPORTED;
|
|
goto out;
|
|
}
|
|
|
|
if (stream->url)
|
|
filename = stream->url;
|
|
else {
|
|
mp_msg(MSGT_OPEN, MSGL_ERR, "[ffmpeg] No URL\n");
|
|
goto out;
|
|
}
|
|
if (!strncmp(filename, prefix, strlen(prefix)))
|
|
filename += strlen(prefix);
|
|
dummy = !strncmp(filename, "rtsp:", 5);
|
|
mp_msg(MSGT_OPEN, MSGL_V, "[ffmpeg] Opening %s\n", filename);
|
|
|
|
if (!dummy && url_open(&ctx, filename, flags) < 0)
|
|
goto out;
|
|
|
|
mp_msg(MSGT_OPEN, MSGL_V, "[ffmpeg] libavformat URL type: %s\n",
|
|
ctx->prot->name);
|
|
if (!strncmp("rtmp", ctx->prot->name, 4)) {
|
|
*file_format = DEMUXER_TYPE_LAVF;
|
|
stream->lavf_type = "flv";
|
|
}
|
|
stream->priv = ctx;
|
|
size = dummy ? 0 : url_filesize(ctx);
|
|
if (size >= 0)
|
|
stream->end_pos = size;
|
|
stream->type = STREAMTYPE_FILE;
|
|
stream->seek = seek;
|
|
if (dummy || ctx->is_streamed) {
|
|
stream->type = STREAMTYPE_STREAM;
|
|
stream->seek = NULL;
|
|
}
|
|
if (!dummy) {
|
|
stream->fill_buffer = fill_buffer;
|
|
stream->write_buffer = write_buffer;
|
|
stream->control = control;
|
|
stream->close = close_f;
|
|
}
|
|
res = STREAM_OK;
|
|
|
|
out:
|
|
return res;
|
|
}
|
|
|
|
const stream_info_t stream_info_ffmpeg = {
|
|
"FFmpeg",
|
|
"ffmpeg",
|
|
"",
|
|
"",
|
|
open_f,
|
|
{ "ffmpeg", "rtmp", NULL },
|
|
NULL,
|
|
1 // Urls are an option string
|
|
};
|