//
// Copyright (C) 2008
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Thorsten Horstmann <tho@berlios.de>
//
-// 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.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// 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.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Thorsten Horstmann <tho@berlios.de>
/** \file
\brief psi2ts.cc non-inline non-template implementation */
//#include "psi2ts.cc.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace {
template <class InputIterator, class Distance>
}
-prefix_ Psi2TsModule::Psi2TsModule()
+prefix_ Psi2TsModule::Psi2TsModule(unsigned pid, senf::ClockService::clock_type timeout)
{
+ pid_ = pid;
continuity_counter_ = 0;
state_ = IDLE;
route( input, output );
input.onRequest( &Psi2TsModule::onRequest );
+ timeout_ = timeout;
}
-
+#include <senf/Utils/hexdump.hh>
prefix_ void Psi2TsModule::onRequest()
{
senf::PacketData & section = input.read().data();
iterator sec_end = section.end();
iterator begin = section.begin();
iterator end = section.begin();
- advance_max( end, 184, sec_end);
-
+ advance_max( end, 183, sec_end);
+
do {
senf::TransportPacket tsPacket (senf::TransportPacket::create(188));
tsPacket->continuity_counter() = next_continuity_counter();
+ tsPacket->pid() = pid_;
if (state_ == IDLE) {
state_ = PROC;
- tsPacket->pusi() = true;
+ tsPacket->setPUSI(true);
+ tsPacket->pointer_field() = 0;
}
senf::PacketData & payloadData (tsPacket.next().data());
- std::copy( begin, end, payloadData.begin() );
+ std::fill(
+ std::copy( begin, end, payloadData.begin() ),
+ payloadData.end(),
+ 0xff
+ );
tsPacket.finalize();
-
+
output.write( tsPacket);
-
+
advance_max( begin, 184, sec_end);
advance_max( end, 184, sec_end);
} while (begin != end);
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "psi2ts.cc.mpp"