~morphis/aethercast/audio-streaming

Viewing changes to tools/raw_streamer.cpp

Committer: Simon Fels
Date: 2016-03-30 13:07:46 UTC
mfrom: (130.2.19 ac-rework-and-new-tests)
Revision ID: simon.fels@canonical.com-20160330130746-zhjzr8j31joom36q

Rework part of the streaming framework and add further unit tests

This reworks the streaming framework to be better testable which wasn't the case before
for all parts. Most critical parts are covered with tests now.

files added:
src/mcs/common/executorfactory.h

src/mcs/common/executorpool.cpp

src/mcs/common/executorpool.h

src/mcs/common/threadedexecutorfactory.cpp

src/mcs/common/threadedexecutorfactory.h

src/mcs/network

src/mcs/network/stream.h

src/mcs/network/types.h

src/mcs/network/udpstream.cpp

src/mcs/network/udpstream.h

src/mcs/video/bufferproducer.h

src/mcs/video/displayoutput.cpp

src/mcs/video/displayoutput.h

tests/mcs/common/executorpool_tests.cpp

tests/mcs/common/threadedexecutorfactory_tests.cpp

tests/mcs/mir

tests/mcs/mir/CMakeLists.txt

tests/mcs/mir/mockmir.cpp

tests/mcs/mir/mockmir.h

tests/mcs/mir/screencast_tests.cpp

tests/mcs/mir/sourcemediamanager_tests.cpp

tests/mcs/mir/streamrenderer_tests.cpp

tests/mcs/networkutils_tests.cpp

tests/mcs/streaming/rtpsender_tests.cpp

files removed:
tools/raw_streamer.cpp

files modified:
src/CMakeLists.txt

src/mcs/android/h264encoder.cpp

src/mcs/android/h264encoder.h

src/mcs/common/executable.h

src/mcs/common/threadedexecutor.cpp

src/mcs/common/threadedexecutor.h

src/mcs/mediamanagerfactory.cpp

src/mcs/mediamanagerfactory.h

src/mcs/mir/screencast.cpp

src/mcs/mir/screencast.h

src/mcs/mir/sourcemediamanager.cpp

src/mcs/mir/sourcemediamanager.h

src/mcs/mir/streamrenderer.cpp

src/mcs/mir/streamrenderer.h

src/mcs/networkutils.cpp

src/mcs/networkutils.h

src/mcs/report/reportfactory.cpp

src/mcs/report/reportfactory.h

src/mcs/streaming/mediasender.cpp

src/mcs/streaming/mediasender.h

src/mcs/streaming/rtpsender.cpp

src/mcs/streaming/rtpsender.h

src/mcs/video/baseencoder.h

tests/mcs/CMakeLists.txt

tests/mcs/android/h264encoder_tests.cpp

tests/mcs/android/mockmedia.cpp

tests/mcs/common/CMakeLists.txt

tests/mcs/common/threadedexecutor_tests.cpp

tests/mcs/streaming/CMakeLists.txt

tests/mcs/streaming/mediasender_tests.cpp

tools/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

tools/raw_streamer.cpp

* 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 2 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <memory.h>

#include <memory>

#include <chrono>

#include <thread>

#include <iostream>

#include <string>

#include <mcs/logger.h>

#include <mcs/report/reportfactory.h>

#include <mcs/streaming/mpegtspacketizer.h>

#include <mcs/streaming/rtpsender.h>

namespace {

static constexpr unsigned int kBufferSize = 2048;

}

int main(int argc, char **argv) {

if (argc != 2 || argv[1] == nullptr) {

std::cout << "Usage: " << std::endl

<< " " << argv[0] << " <input>" << std::endl;

return -EINVAL;

}

int fin = ::open(argv[1], O_RDONLY);

if (fin < 0) {

MCS_ERROR("Failed to open input file %s", argv[1]);

return -EINVAL;

}

auto report_factory = mcs::report::ReportFactory::Create();

auto packetizer = mcs::streaming::MPEGTSPacketizer::Create(report_factory->CreatePacketizerReport());

auto sender = mcs::streaming::RTPSender::Create("192.168.178.1", 5000, report_factory->CreateSenderReport());

if (!sender)

return -EIO;

int track_index = packetizer->AddTrack(mcs::streaming::MPEGTSPacketizer::TrackFormat{"video/avc"});

int counter = 0;

while (true) {

uint8_t inbuf[kBufferSize];

auto bytes_read = ::read(fin, inbuf, kBufferSize);

if (bytes_read < 0) {

MCS_ERROR("Failed to read input data");

break;

}

else if (bytes_read == 0)

break;

auto buffer = mcs::video::Buffer::Create(bytes_read, mcs::Utils::GetNowUs());

::memcpy(buffer->Data(), inbuf, bytes_read);

mcs::video::Buffer::Ptr outbuf;

int flags = 0;

if (!(counter % 100))

flags = mcs::streaming::MPEGTSPacketizer::kEmitPCR |

mcs::streaming::MPEGTSPacketizer::kEmitPATandPMT;

packetizer->Packetize(track_index, buffer, &outbuf, flags);

sender->Queue(outbuf);

counter++;

std::this_thread::sleep_for(std::chrono::milliseconds{1});

}

::close(fin);

return 0;

}

Older »