Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Amlcodec #2691

Merged
merged 5 commits into from

5 participants

@davilla
Collaborator

adds DVDVideoCodecAmlogic

@davilla davilla merged commit 1c4bf5d into from
@jmarshallnz jmarshallnz commented on the diff
xbmc/cores/VideoRenderers/RenderFeatures.h
((6 lines not shown))
+ * 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/>.
+ *
+ */
+
@jmarshallnz Owner

you need #include here.

@davilla Collaborator
davilla added a note

eh ? #include of what ? vector?

@jmarshallnz Owner

yeah - silly github comments drop out xml-isms
#include <vector>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz commented on the diff
xbmc/cores/VideoRenderers/RenderManager.h
@@ -110,6 +110,8 @@ class CXBMCRenderManager
void UpdateResolution();
+ bool RendererHandlesPresent();
@jmarshallnz Owner

const ?

@davilla Collaborator
davilla added a note

maybe, I figure that @theuni would be changing this so I punt to him

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz commented on the diff
xbmc/cores/amlplayer/AMLPlayer.cpp
@@ -302,7 +317,7 @@ static const char* AudioCodecName(int aformat)
////////////////////////////////////////////////////////////////////////////////////////////
CAMLSubTitleThread::CAMLSubTitleThread(DllLibAmplayer *dll) :
- CThread("AMLSubTitle"),
+ CThread("CAMLSubTitleThread"),
@jmarshallnz Owner

this reverts a previous change (cosmetic, but it doesn't really make sense).

@davilla Collaborator
davilla added a note

my bad :) will revert that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz commented on the diff
xbmc/cores/amlplayer/AMLPlayer.cpp
@@ -313,6 +328,20 @@ static const char* AudioCodecName(int aformat)
StopThread();
}
+void CAMLSubTitleThread::Flush()
+{
+ CSingleLock lock(m_subtitle_csection);
+ if (m_subtitle_strings.size())
+ {
+ // remove any expired subtitles
+ std::deque<AMLSubtitle*>::iterator it = m_subtitle_strings.begin();
+ while (it != m_subtitle_strings.end())
+ {
+ it = m_subtitle_strings.erase(it);
+ }
+ }
@jmarshallnz Owner

m_subtitle_strings.clear() ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz commented on the diff
xbmc/cores/amlplayer/AMLPlayer.cpp
((7 lines not shown))
// sub_pts are in ffmpeg timebase, not ms timebase, convert it.
- int sub_pts = (sub_buffer[12] << 24) | (sub_buffer[13] << 16) | (sub_buffer[14] << 8) | sub_buffer[15];
+ sub_pts = (sub_buffer[12] << 24) | (sub_buffer[13] << 16) | (sub_buffer[14] << 8) | sub_buffer[15];
@jmarshallnz Owner

These 3 blocks appear to revert a previous commit - sub_type and sub_pts should have their scope restricted.

@davilla Collaborator
davilla added a note

ack

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz commented on the diff
xbmc/utils/AMLUtils.h
@@ -1,6 +1,6 @@
#pragma once
/*
- * Copyright (C) 2011-2013 Team XBMC
+ * Copyright (C) 2011-2012 Team XBMC
@jmarshallnz Owner

time is running backwards

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@rbej

Compile error on Rpi

In file included from /home/rbej/OpenELEC.tv/build.OpenELEC-RPi.arm-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include/linux/fb.h:5:0,
from EGLNativeTypeAmlogic.cpp:27:
/home/rbej/OpenELEC.tv/build.OpenELEC-RPi.arm-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include/linux/i2c.h:129:16: error: multiple types in one declaration
/home/rbej/OpenELEC.tv/build.OpenELEC-RPi.arm-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include/linux/i2c.h:129:16: error: declaration does not declare anything [-fpermissive]
make[2]: *** [EGLNativeTypeAmlogic.o] Error 1
make[2]: Leaving directory `/home/rbej/OpenELEC.tv/build.OpenELEC-RPi.arm-devel/xbmc-3950d3c/xbmc/windowing/egl'
make[1]: *** [xbmc/windowing/egl/windowing_egl.a] Error 2
make[1]: *** Waiting for unfinished jobs....

@huceke
Collaborator
@t-nelson

This is always true due to the condition above.

@notspiff notspiff referenced this pull request from a commit in notspiff/kodi-cmake
@huceke huceke [rbp] fixed compile on raspberrypi
fixing the following compile error on raspberrypi introduced by xbmc/xbmc#2691

make: Entering directory `/media/usbdisk/xbmc/xbmc-bcm/xbmc-rbp/xbmc/windowing/egl'
CPP     xbmc/windowing/egl/EGLNativeTypeAmlogic.o
In file included from /media/usbdisk/xbmc/xbmc-bcm/buildroot-rbp/output/host/usr/arm-unknown-linux-gnueabi/sysroot/usr/include/linux/fb.h:5:0,
                 from EGLNativeTypeAmlogic.cpp:31:
                 /media/usbdisk/xbmc/xbmc-bcm/buildroot-rbp/output/host/usr/arm-unknown-linux-gnueabi/sysroot/usr/include/linux/i2c.h:126:7: error: multiple types in one declaration
                 /media/usbdisk/xbmc/xbmc-bcm/buildroot-rbp/output/host/usr/arm-unknown-linux-gnueabi/sysroot/usr/include/linux/i2c.h:126:7: error: declaration does not declare anything [-fpermissive]
                 make: *** [EGLNativeTypeAmlogic.o] Fehler 1
2da5c65
@davilla davilla deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.