Skip to content
GitLab
Commit 9fd2fb86 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #6161: receive and decode video in another thread 

Presently the receiver is hardcoded to look for test.sdp. It should be
getting the sdp in memory, not looking for a file.
parent 046b3ef7
Expand all Hide whitespace changes
Inline Side-by-side
sflphone-common/libs/video/Makefile.am
View file @ 9fd2fb86
......@@ -6,7 +6,8 @@ noinst_LTLIBRARIES = libvideo_endpoint.la
libvideo_endpoint_la_SOURCES = video_endpoint.cpp video_endpoint.h \
libav_utils.cpp libav_utils.h \
video_rtp_session.cpp video_rtp_session.h \
video_rtp_factory.cpp video_rtp_factory.h
video_rtp_factory.cpp video_rtp_factory.h \
video_rtp_thread.h video_rtp_thread.cpp
libvideo_endpoint_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @CCRTP_LIBS@
AM_CXXFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ @CCRTP_CFLAGS@
......
sflphone-common/libs/video/video_rtp_session.cpp
View file @ 9fd2fb86
......@@ -29,411 +29,15 @@
*/
#include "video_rtp_session.h"
extern "C" {
#define __STDC_CONSTANT_MACROS
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/opt.h>
#include <libavdevice/avdevice.h>
#include <libswscale/swscale.h>
}
#include <string>
#include <iostream>
#include <cassert>
#include <iostream>
#include <sstream>
#include <fstream>
#include <map>
#include <cc++/thread.h>
#include <signal.h>
#include <string>
#include "video_rtp_thread.h"
namespace sfl_video {
class VideoRtpSendThread : public ost::Thread {
private:
static void print_error(const char *filename, int err)
{
char errbuf[128];
const char *errbuf_ptr = errbuf;
if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
errbuf_ptr = strerror(AVUNERROR(err));
std::cerr << filename << ":" << errbuf_ptr << std::endl;
}
static void print_and_save_sdp(AVFormatContext **avc)
{
size_t sdp_size = avc[0]->streams[0]->codec->extradata_size + 2048;
char *sdp = reinterpret_cast<char*>(malloc(sdp_size)); /* theora sdp can be huge */
std::cerr << "sdp_size: " << sdp_size << std::endl;
av_sdp_create(avc, 1, sdp, sdp_size);
std::ofstream sdp_file("test.sdp");
std::istringstream iss(sdp);
std::string line;
while (std::getline(iss, line))
{
/* strip windows line ending */
sdp_file << line.substr(0, line.length() - 1) << std::endl;
std::cerr << line << std::endl;
}
sdp_file << std::endl;
sdp_file.close();
free(sdp);
}
std::map<std::string, std::string> args_;
volatile int interrupted_;
/*-------------------------------------------------------------*/
/* These variables should be used in thread (i.e. run()) only! */
/*-------------------------------------------------------------*/
uint8_t *scaledPictureBuf_;
uint8_t *outbuf_;
AVCodecContext *inputDecoderCtx_;
AVFrame *rawFrame_;
AVFrame *scaledPicture_;
int videoStreamIndex_;
int outbufSize_;
AVCodecContext *encoderCtx_;
AVStream *videoStream_;
AVFormatContext *inputCtx_;
AVFormatContext *outputCtx_;
void forcePresetX264()
{
std::cerr << "get x264 preset time" << std::endl;
//int opt_name_count = 0;
FILE *f = 0;
// FIXME: hardcoded! should look for FFMPEG_DATADIR
const char* preset_filename = "libx264-ultrafast.ffpreset";
/* open preset file for libx264 */
f = fopen(preset_filename, "r");
if (f == 0)
{
std::cerr << "File for preset ' " << preset_filename << "' not"
"found" << std::endl;
cleanup();
}
/* grab preset file and put it in character buffer */
fseek(f, 0, SEEK_END);
long pos = ftell(f);
fseek(f, 0, SEEK_SET);
char *encoder_options_string = reinterpret_cast<char*>(malloc(pos + 1));
fread(encoder_options_string, pos, 1, f);
encoder_options_string[pos] = '\0';
fclose(f);
std::cerr << "Encoder options: " << encoder_options_string << std::endl;
av_set_options_string(encoderCtx_, encoder_options_string, "=", "\n");
free(encoder_options_string); // free allocated memory
}
void setup()
{
av_register_all();
avdevice_register_all();
AVInputFormat *file_iformat = 0;
// it's a v4l device if starting with /dev/video
if (args_["input"].substr(0, strlen("/dev/video")) == "/dev/video")
{
std::cerr << "Using v4l2 format" << std::endl;
file_iformat = av_find_input_format("video4linux2");
if (!file_iformat)
{
std::cerr << "Could not find format!" << std::endl;
cleanup();
}
}
// Open video file
if (av_open_input_file(&inputCtx_, args_["input"].c_str(), file_iformat, 0, NULL) != 0)
{
std::cerr << "Could not open input file " << args_["input"] <<
std::endl;
cleanup();
}
// retrieve stream information
if (av_find_stream_info(inputCtx_) < 0) {
std::cerr << "Could not find stream info!" << std::endl;
cleanup();
}
// find the first video stream from the input
unsigned i;
for (i = 0; i < inputCtx_->nb_streams; i++)
{
if (inputCtx_->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
{
videoStreamIndex_ = i;
break;
}
}
if (videoStreamIndex_ == -1)
{
std::cerr << "Could not find video stream!" << std::endl;
cleanup();
}
// Get a pointer to the codec context for the video stream
inputDecoderCtx_ = inputCtx_->streams[videoStreamIndex_]->codec;
// find the decoder for the video stream
AVCodec *inputDecoder = avcodec_find_decoder(inputDecoderCtx_->codec_id);
if (inputDecoder == NULL)
{
std::cerr << "Unsupported codec!" << std::endl;
cleanup();
}
// open codec
if (avcodec_open(inputDecoderCtx_, inputDecoder) < 0)
{
std::cerr << "Could not open codec!" << std::endl;
cleanup();
}
outputCtx_ = avformat_alloc_context();
AVOutputFormat *file_oformat = av_guess_format("rtp", args_["destination"].c_str(), NULL);
if (!file_oformat)
{
std::cerr << "Unable to find a suitable output format for " <<
args_["destination"] << std::endl;
cleanup();
}
outputCtx_->oformat = file_oformat;
strncpy(outputCtx_->filename, args_["destination"].c_str(),
sizeof(outputCtx_->filename));
AVCodec *encoder = 0;
/* find the video encoder */
encoder = avcodec_find_encoder_by_name(args_["codec"].c_str());
if (encoder == 0)
{
std::cerr << "encoder not found" << std::endl;
cleanup();
}
encoderCtx_ = avcodec_alloc_context();
// set some encoder settings here
encoderCtx_->bit_rate = args_.size() > 2 ? atoi(args_["bitrate"].c_str()) : 1000000;
// emit one intra frame every gop_size frames
encoderCtx_->gop_size = 15;
encoderCtx_->max_b_frames = 0;
encoderCtx_->rtp_payload_size = 0; // Target GOB length
// resolution must be a multiple of two
encoderCtx_->width = inputDecoderCtx_->width; // get resolution from input
encoderCtx_->height = inputDecoderCtx_->height;
// fps
encoderCtx_->time_base = (AVRational){1, 30};
encoderCtx_->pix_fmt = PIX_FMT_YUV420P;
/* let x264 preset override our encoder settings */
if (args_["codec"] == "libx264")
forcePresetX264();
scaledPicture_ = avcodec_alloc_frame();
// open encoder
if (avcodec_open(encoderCtx_, encoder) < 0)
{
std::cerr << "Could not open encoder" << std::endl;
cleanup();
}
// add video stream to outputformat context
videoStream_ = av_new_stream(outputCtx_, 0);
if (videoStream_ == 0)
{
std::cerr << "Could not alloc stream" << std::endl;
cleanup();
}
videoStream_->codec = encoderCtx_;
// set the output parameters (must be done even if no
// parameters).
if (av_set_parameters(outputCtx_, NULL) < 0)
{
std::cerr << "Invalid output format parameters" << std::endl;
cleanup();
}
// open the output file, if needed
if (!(file_oformat->flags & AVFMT_NOFILE))
{
if (avio_open(&outputCtx_->pb, outputCtx_->filename, AVIO_FLAG_WRITE) < 0)
{
std::cerr << "Could not open '" << outputCtx_->filename << "'" <<
std::endl;
cleanup();
}
}
else
std::cerr << "No need to open" << std::endl;
av_dump_format(outputCtx_, 0, outputCtx_->filename, 1);
print_and_save_sdp(&outputCtx_);
char error[1024];
// write the stream header, if any
if (av_write_header(outputCtx_) < 0)
{
snprintf(error, sizeof(error), "Could not write header for output file (incorrect codec parameters ?)");
cleanup();
}
// allocate video frame
rawFrame_ = avcodec_alloc_frame();
// alloc image and output buffer
outbufSize_ = encoderCtx_->width * encoderCtx_->height;
outbuf_ = reinterpret_cast<uint8_t*>(av_malloc(outbufSize_));
// allocate buffer that fits YUV 420
scaledPictureBuf_ = reinterpret_cast<uint8_t*>(av_malloc((outbufSize_ * 3) / 2));
scaledPicture_->data[0] = scaledPictureBuf_;
scaledPicture_->data[1] = scaledPicture_->data[0] + outbufSize_;
scaledPicture_->data[2] = scaledPicture_->data[1] + outbufSize_ / 4;
scaledPicture_->linesize[0] = encoderCtx_->width;
scaledPicture_->linesize[1] = encoderCtx_->width / 2;
scaledPicture_->linesize[2] = encoderCtx_->width / 2;
}
void cleanup()
{
// write the trailer, if any. the trailer must be written
// before you close the CodecContexts open when you wrote the
// header; otherwise write_trailer may try to use memory that
// was freed on av_codec_close()
av_write_trailer(outputCtx_);
av_free(scaledPictureBuf_);
av_free(outbuf_);
// free the scaled frame
av_free(scaledPicture_);
// free the YUV frame
av_free(rawFrame_);
// close the codecs
avcodec_close(encoderCtx_);
// doesn't need to be freed, we didn't use avcodec_alloc_context
avcodec_close(inputDecoderCtx_);
// close the video file
av_close_input_file(inputCtx_);
// exit this thread
exit();
}
SwsContext * createScalingContext()
{
// Create scaling context
SwsContext *imgConvertCtx = sws_getContext(inputDecoderCtx_->width,
inputDecoderCtx_->height, inputDecoderCtx_->pix_fmt, encoderCtx_->width,
encoderCtx_->height, encoderCtx_->pix_fmt, SWS_BICUBIC,
NULL, NULL, NULL);
if (imgConvertCtx == 0)
{
std::cerr << "Cannot init the conversion context!" << std::endl;
cleanup();
}
return imgConvertCtx;
}
public:
VideoRtpSendThread(const std::map<std::string, std::string> &args) : args_(args),
interrupted_(false) {}
virtual void run()
{
setup();
AVPacket inpacket;
int frameFinished;
int64_t frameNumber = 0;
SwsContext *imgConvertCtx = createScalingContext();
while (not interrupted_ and av_read_frame(inputCtx_, &inpacket) >= 0)
{
// is this a packet from the video stream?
if (inpacket.stream_index == videoStreamIndex_)
{
// decode video frame from camera
avcodec_decode_video2(inputDecoderCtx_, rawFrame_, &frameFinished, &inpacket);
if (frameFinished)
{
sws_scale(imgConvertCtx, rawFrame_->data, rawFrame_->linesize,
0, inputDecoderCtx_->height, scaledPicture_->data,
scaledPicture_->linesize);
// Set presentation timestamp on our scaled frame before encoding it
scaledPicture_->pts = frameNumber;
frameNumber++;
int encodedSize = avcodec_encode_video(encoderCtx_,
outbuf_, outbufSize_, scaledPicture_);
if (encodedSize > 0) {
AVPacket opkt;
av_init_packet(&opkt);
opkt.data = outbuf_;
opkt.size = encodedSize;
// rescale pts from encoded video framerate to rtp
// clock rate
if (static_cast<unsigned>(encoderCtx_->coded_frame->pts) !=
AV_NOPTS_VALUE)
opkt.pts = av_rescale_q(encoderCtx_->coded_frame->pts,
encoderCtx_->time_base, videoStream_->time_base);
else
opkt.pts = 0;
// is it a key frame?
if (encoderCtx_->coded_frame->key_frame)
opkt.flags |= AV_PKT_FLAG_KEY;
opkt.stream_index = videoStream_->index;
// write the compressed frame in the media file
int ret = av_interleaved_write_frame(outputCtx_, &opkt);
if (ret < 0)
{
print_error("av_interleaved_write_frame() error", ret);
cleanup();
}
av_free_packet(&opkt);
}
}
}
// free the packet that was allocated by av_read_frame
av_free_packet(&inpacket);
}
// free resources, exit thread
cleanup();
}
void stop()
{
// FIXME: not thread safe
interrupted_ = true;
}
virtual ~VideoRtpSendThread()
{
terminate();
}
};
VideoRtpSession::VideoRtpSession(const std::string &input,
const std::string &codec,
int bitrate,
......@@ -460,14 +64,20 @@ void VideoRtpSession::start()
rtpSendThread_.reset(new VideoRtpSendThread(args));
rtpSendThread_->start();
args["input"] = "test.sdp";
rtpReceiveThread_.reset(new VideoRtpReceiveThread(args));
rtpReceiveThread_->start();
}
void VideoRtpSession::stop()
{
std::cerr << "Stopping video rtp session " << std::endl;
// FIXME: all kinds of evil!!! interrupted should be atomic
rtpReceiveThread_->stop();
rtpSendThread_->stop();
std::cerr << "cancelled video rtp session " << std::endl;
rtpReceiveThread_.reset();
rtpSendThread_.reset();
}
......
sflphone-common/libs/video/video_rtp_session.h
View file @ 9fd2fb86
......@@ -52,6 +52,7 @@ class VideoRtpSession {
const int bitrate_;
const std::string destinationURI_;
std::tr1::shared_ptr<VideoRtpSendThread> rtpSendThread_;
std::tr1::shared_ptr<VideoRtpReceiveThread> rtpReceiveThread_;
};
}
......
sflphone-common/libs/video/video_rtp_thread.cpp 0 → 100644
View file @ 9fd2fb86
This diff is collapsed.
sflphone-common/libs/video/video_rtp_thread.h 0 → 100644
View file @ 9fd2fb86
/*
* Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* This program 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 3 of the License, or
* (at your option) any later version.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef _VIDEO_RTP_THREAD_H_
#define _VIDEO_RTP_THREAD_H_
#include <cc++/thread.h>
#include <map>
#include <string>
class SwsContext;
class AVCodecContext;
class AVStream;
class AVFormatContext;
class AVFrame;
namespace sfl_video {
class VideoRtpReceiveThread : public ost::Thread {
private:
std::map<std::string, std::string> args_;
volatile int interrupted_;
/*-------------------------------------------------------------*/
/* These variables should be used in thread (i.e. run()) only! */
/*-------------------------------------------------------------*/
uint8_t *scaledPictureBuf_;
uint8_t *shmBuffer_;
int shmID_;
int semSetID_;
AVCodecContext *decoderCtx_;
AVFrame *rawFrame_;
AVFrame *scaledPicture_;
int videoStreamIndex_;
AVFormatContext *inputCtx_;
void setup();
void cleanup();
SwsContext * createScalingContext();
public:
VideoRtpReceiveThread(const std::map<std::string, std::string> &args);
virtual ~VideoRtpReceiveThread();
virtual void run();
void stop();
};
class VideoRtpSendThread : public ost::Thread {
private:
static void print_error(const char *filename, int err);
void forcePresetX264();
void print_and_save_sdp();
void setup();
void cleanup();
SwsContext * createScalingContext();
std::map<std::string, std::string> args_;
volatile int interrupted_;
/*-------------------------------------------------------------*/
/* These variables should be used in thread (i.e. run()) only! */
/*-------------------------------------------------------------*/
uint8_t *scaledPictureBuf_;
uint8_t *outbuf_;
AVCodecContext *inputDecoderCtx_;
AVFrame *rawFrame_;
AVFrame *scaledPicture_;
int videoStreamIndex_;
int outbufSize_;
AVCodecContext *encoderCtx_;
AVStream *videoStream_;
AVFormatContext *inputCtx_;
AVFormatContext *outputCtx_;
public:
VideoRtpSendThread(const std::map<std::string, std::string> &args);
virtual ~VideoRtpSendThread();
virtual void run();
void stop();
};
}
#endif // _VIDEO_RTP_THREAD_H_
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment