Amlcodec #2691

Merged
merged 5 commits into from May 9, 2013

Conversation

Projects
None yet
5 participants
Contributor

davilla commented May 5, 2013

adds DVDVideoCodecAmlogic

davilla added a commit that referenced this pull request May 9, 2013

@davilla davilla merged commit 1c4bf5d into xbmc:master May 9, 2013

+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
@jmarshallnz

jmarshallnz May 9, 2013

Member

you need #include here.

@davilla

davilla May 9, 2013

Contributor

eh ? #include of what ? vector?

@jmarshallnz

jmarshallnz May 9, 2013

Member

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

@@ -110,6 +110,8 @@ class CXBMCRenderManager
void UpdateResolution();
+ bool RendererHandlesPresent();
@davilla

davilla May 9, 2013

Contributor

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

@@ -302,7 +317,7 @@ static const char* AudioCodecName(int aformat)
////////////////////////////////////////////////////////////////////////////////////////////
CAMLSubTitleThread::CAMLSubTitleThread(DllLibAmplayer *dll) :
- CThread("AMLSubTitle"),
+ CThread("CAMLSubTitleThread"),
@jmarshallnz

jmarshallnz May 9, 2013

Member

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

@davilla

davilla May 9, 2013

Contributor

my bad :) will revert that.

+ {
+ it = m_subtitle_strings.erase(it);
+ }
+ }
@jmarshallnz

jmarshallnz May 9, 2013

Member

m_subtitle_strings.clear() ?

// 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

jmarshallnz May 9, 2013

Member

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

@davilla

davilla May 9, 2013

Contributor

ack

@@ -1,6 +1,6 @@
#pragma once
/*
- * Copyright (C) 2011-2013 Team XBMC
+ * Copyright (C) 2011-2012 Team XBMC
@jmarshallnz

jmarshallnz May 9, 2013

Member

time is running backwards

rbej commented May 11, 2013

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....

Contributor

huceke commented May 11, 2013

This is always true due to the condition above.

notspiff pushed a commit to notspiff/kodi-cmake that referenced this pull request Nov 3, 2013

[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

@davilla davilla deleted the davilla:amlcodec branch Feb 27, 2014

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