[omxplayer/dvdplayer] added bxa(AirTunes) demuxer.

This enables DVDPlayer and OMXPlayer as AirTunes player.
huceke · Oct 7, 2012 · 169493b · 169493b
1 parent bd22a8f
commit 169493b
Show file tree

Hide file tree

Showing 4 changed files with 290 additions and 0 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp
@@ -0,0 +1,193 @@
+/*
+ *      Copyright (C) 2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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, 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 XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DVDInputStreams/DVDInputStream.h"
+#include "DVDDemuxBXA.h"
+#include "DVDDemuxUtils.h"
+#include "utils/log.h"
+#include "../DVDClock.h"
+
+// AirTunes audio Demuxer.
+
+using namespace std;
+
+class CDemuxStreamAudioBXA
+  : public CDemuxStreamAudio
+{
+  CDVDDemuxBXA  *m_parent;
+  string         m_codec;
+public:
+  CDemuxStreamAudioBXA(CDVDDemuxBXA *parent, const string& codec)
+    : m_parent(parent)
+    , m_codec(codec)
+
+  {}
+  void GetStreamInfo(string& strInfo)
+  {
+    CStdString info;
+    info.Format("%s", m_codec.c_str());
+    strInfo = info;
+  }
+};
+
+CDVDDemuxBXA::CDVDDemuxBXA() : CDVDDemux()
+{
+  m_pInput = NULL;
+  m_stream = NULL;
+  memset(&m_header, 0x0, sizeof(Demux_BXA_FmtHeader));
+}
+
+CDVDDemuxBXA::~CDVDDemuxBXA()
+{
+  Dispose();
+}
+
+bool CDVDDemuxBXA::Open(CDVDInputStream* pInput)
+{
+  Abort();
+
+  Dispose();
+
+  if(!pInput || !pInput->IsStreamType(DVDSTREAM_TYPE_FILE))
+    return false;
+
+  if(pInput->Read((BYTE *)&m_header, sizeof(Demux_BXA_FmtHeader)) < 1)
+    return false;
+
+  // file valid?
+  if (strncmp(m_header.fourcc, "BXA ", 4) != 0 || m_header.type != BXA_PACKET_TYPE_FMT_DEMUX)
+  {
+    pInput->Seek(0, SEEK_SET);
+    return false;
+  }
+
+  m_pInput = pInput;
+
+  m_stream = new CDemuxStreamAudioBXA(this, "BXA");
+
+  if(!m_stream)
+    return false;
+
+  m_stream->iSampleRate     = m_header.sampleRate;
+  m_stream->iBitsPerSample  = m_header.bitsPerSample;
+  m_stream->iBitRate        = m_header.sampleRate * m_header.channels * m_header.bitsPerSample;
+  m_stream->iChannels       = m_header.channels;
+  m_stream->type            = STREAM_AUDIO;
+  m_stream->codec           = CODEC_ID_PCM_S16LE;
+
+  return true;
+}
+
+void CDVDDemuxBXA::Dispose()
+{
+  delete m_stream;
+  m_stream = NULL;
+
+  m_pInput = NULL;
+  m_pts    = 0;
+
+  memset(&m_header, 0x0, sizeof(Demux_BXA_FmtHeader));
+}
+
+void CDVDDemuxBXA::Reset()
+{
+  CDVDInputStream* pInputStream = m_pInput;
+  Dispose();
+  Open(pInputStream);
+}
+
+void CDVDDemuxBXA::Abort()
+{
+  if(m_pInput)
+    return m_pInput->Abort();
+}
+
+void CDVDDemuxBXA::Flush()
+{
+}
+
+#define BXA_READ_SIZE 4096
+DemuxPacket* CDVDDemuxBXA::Read()
+{
+  if(!m_pInput)
+    return NULL;
+
+  DemuxPacket* pPacket = CDVDDemuxUtils::AllocateDemuxPacket(BXA_READ_SIZE);
+
+  if (!pPacket)
+  {
+    if (m_pInput)
+      m_pInput->Close();
+    return NULL;
+  }
+
+  pPacket->iSize = m_pInput->Read(pPacket->pData, BXA_READ_SIZE);
+  pPacket->iStreamId = 0;
+
+  if(pPacket->iSize < 1)
+  {
+    delete pPacket;
+    pPacket = NULL;
+  }
+  else
+  {
+    int n = (m_header.channels * m_header.bitsPerSample * m_header.sampleRate)>>3;
+    if (n > 0)
+    {
+      m_pts += ((double)pPacket->iSize * DVD_TIME_BASE) / n;
+      pPacket->dts = m_pts;
+      pPacket->pts = m_pts;
+    }
+    else
+    {
+      pPacket->dts = DVD_NOPTS_VALUE;
+      pPacket->pts = DVD_NOPTS_VALUE;
+    }
+  }
+
+  return pPacket;
+}
+
+CDemuxStream* CDVDDemuxBXA::GetStream(int iStreamId)
+{
+  if(iStreamId != 0)
+    return NULL;
+
+  return m_stream;
+}
+
+int CDVDDemuxBXA::GetNrOfStreams()
+{
+  return (m_stream == NULL ? 0 : 1);
+}
+
+std::string CDVDDemuxBXA::GetFileName()
+{
+  if(m_pInput)
+    return m_pInput->GetFileName();
+  else
+    return "";
+}
+
+void CDVDDemuxBXA::GetStreamCodecName(int iStreamId, CStdString &strName)
+{
+  if (m_stream && iStreamId == 0)
+    strName = "BXA";
+}
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h
@@ -0,0 +1,85 @@
+#pragma once
+/*
+ *      Copyright (C) 2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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, 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 XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DVDDemux.h"
+
+#ifdef _WIN32
+#define __attribute__(dummy_val)
+#else
+#include <config.h>
+#endif
+
+#ifdef _WIN32
+#pragma pack(push)
+#pragma pack(1)
+#endif
+
+typedef struct
+{
+  char fourcc[4];
+  uint32_t type;
+  uint32_t channels;
+  uint32_t sampleRate;
+  uint32_t bitsPerSample;
+  uint64_t durationMs;
+} __attribute__((__packed__)) Demux_BXA_FmtHeader;
+
+#ifdef _WIN32
+#pragma pack(pop)
+#endif
+
+#include <vector>
+
+#define BXA_PACKET_TYPE_FMT_DEMUX 1
+
+class CDemuxStreamAudioBXA;
+
+class CDVDDemuxBXA : public CDVDDemux
+{
+public:
+
+  CDVDDemuxBXA();
+  ~CDVDDemuxBXA();
+
+  bool Open(CDVDInputStream* pInput);
+  void Dispose();
+  void Reset();
+  void Abort();
+  void Flush();
+  DemuxPacket* Read();
+  bool SeekTime(int time, bool backwords = false, double* startpts = NULL) { return false; }
+  void SetSpeed(int iSpeed) {};
+  int GetStreamLength() { return m_header.durationMs; }
+  CDemuxStream* GetStream(int iStreamId);
+  int GetNrOfStreams();
+  std::string GetFileName();
+  virtual void GetStreamCodecName(int iStreamId, CStdString &strName);
+
+protected:
+  friend class CDemuxStreamAudioBXA;
+  CDVDInputStream* m_pInput;
+  double m_pts;
+
+  CDemuxStreamAudioBXA *m_stream;
+
+  Demux_BXA_FmtHeader m_header;
+};
+
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
@@ -30,6 +30,7 @@
 #ifdef HAS_FILESYSTEM_HTSP
 #include "DVDDemuxHTSP.h"
 #endif
+#include "DVDDemuxBXA.h"
 #include "DVDDemuxPVRClient.h"
 #include "pvr/PVRManager.h"
 #include "pvr/addons/PVRClients.h"
@@ -39,6 +40,16 @@ using namespace PVR;
 
 CDVDDemux* CDVDFactoryDemuxer::CreateDemuxer(CDVDInputStream* pInputStream)
 {
+  // Try to open the AirTunes demuxer
+  if (pInputStream->IsStreamType(DVDSTREAM_TYPE_FILE) && pInputStream->GetContent().compare("audio/x-xbmc-pcm") == 0 )
+  {
+    auto_ptr<CDVDDemuxBXA> demuxer(new CDVDDemuxBXA());
+    if(demuxer->Open(pInputStream))
+      return demuxer.release();
+    else
+      return NULL;
+  }
+
   if (pInputStream->IsStreamType(DVDSTREAM_TYPE_HTTP))
   {
     CDVDInputStreamHttp* pHttpStream = (CDVDInputStreamHttp*)pInputStream;

diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in b/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in
@@ -1,6 +1,7 @@
 INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
 
 SRCS  = DVDDemux.cpp
+SRCS += DVDDemuxBXA.cpp
 SRCS += DVDDemuxFFmpeg.cpp
 SRCS += DVDDemuxHTSP.cpp
 SRCS += DVDDemuxPVRClient.cpp