Commit a734c0cb authored by Ghislain MARY's avatar Ghislain MARY

Support build with theora codec when using CMake.

parent 3e5e374d
......@@ -278,7 +278,13 @@ if(ENABLE_GLX)
endif()
endif()
# TODO: Handle SDL option
# TODO: Handle Theora option
if(ENABLE_THEORA)
find_package(Theora)
if(NOT THEORA_FOUND)
message(WARNING "Could not find theora library, mediastreamer2 will be compiled without theora support.")
set(ENABLE_THEORA OFF CACHE BOOL "Enable theora video codec support." FORCE)
endif()
endif()
if(ENABLE_VPX)
find_package(VPX)
if(VPX_FOUND)
......
############################################################################
# FindTheora.txt
# Copyright (C) 2016 Belledonne Communications, Grenoble France
#
############################################################################
#
# 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
############################################################################
#
# - Find the theora include file and library
#
# THEORA_FOUND - system has theora
# THEORA_INCLUDE_DIRS - the theora include directory
# THEORA_LIBRARIES - The libraries needed to use theora
find_path(THEORA_INCLUDE_DIRS
NAMES theora/theora.h
PATH_SUFFIXES include
)
if(THEORA_INCLUDE_DIRS)
set(HAVE_THEORA_THEORA_H 1)
endif()
find_library(THEORA_LIBRARIES
NAMES theora
PATH_SUFFIXES bin lib
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Theora
DEFAULT_MSG
THEORA_INCLUDE_DIRS THEORA_LIBRARIES HAVE_THEORA_THEORA_H
)
mark_as_advanced(THEORA_INCLUDE_DIRS THEORA_LIBRARIES HAVE_THEORA_THEORA_H)
......@@ -260,7 +260,7 @@ static void packetize_and_send(MSFilter *f, EncState *s, mblk_t *om, uint32_t ti
int npackets=0;
static const int ident=0xdede;
while(om!=NULL){
if (om->b_wptr-om->b_rptr>=s->mtu){
if ((unsigned int)(om->b_wptr-om->b_rptr)>=s->mtu){
packet=dupb(om);
packet->b_wptr=packet->b_rptr+s->mtu;
om->b_rptr=packet->b_wptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment