Commit 008a3f7b authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer
Browse files

ios: fix merge

parent e2976229
......@@ -31,9 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <ortp/ortp.h>
#include <ortp/event.h>
#ifndef TARGET_OS_IPHONE
#include <ortp/zrtp.h>
#endif
#define PAYLOAD_TYPE_FLAG_CAN_RECV PAYLOAD_TYPE_USER_FLAG_1
#define PAYLOAD_TYPE_FLAG_CAN_SEND PAYLOAD_TYPE_USER_FLAG_2
......@@ -75,9 +73,7 @@ struct _AudioStream
bool_t use_ng;/*noise gate*/
bool_t use_rc;
bool_t is_beginning;
#ifndef TARGET_OS_IPHONE
OrtpZrtpContext *ortpZrtpContext;
#endif
};
#ifdef __cplusplus
......@@ -234,9 +230,7 @@ struct _VideoStream
MSWebCam *cam;
bool_t use_preview_window;
bool_t adapt_bitrate;
#ifndef TARGET_OS_IPHONE
OrtpZrtpContext *ortpZrtpContext;
#endif
};
typedef struct _VideoStream VideoStream;
......
......@@ -786,8 +786,6 @@ MS2_PUBLIC float audio_stream_get_average_quality_rating(AudioStream *stream){
return 0;
}
#ifndef TARGET_OS_IPHONE
void audio_stream_enable_zrtp(AudioStream *stream, OrtpZrtpParams *params){
stream->ortpZrtpContext=ortp_zrtp_context_new(stream->session, params);
}
#endif
......@@ -91,11 +91,8 @@ struct g722_encode_state {
int out_bits;
};
<<<<<<< HEAD
=======
typedef struct g722_encode_state g722_encode_state_t;
>>>>>>> origin/master
struct g722_decode_state {
// TRUE if the operating in the special ITU test mode, with the band split filters disabled.
int itu_test_mode;
......@@ -134,11 +131,8 @@ struct g722_decode_state {
int out_bits;
};
<<<<<<< HEAD
=======
typedef struct g722_decode_state g722_decode_state_t;
>>>>>>> origin/master
#ifdef __cplusplus
extern "C" {
#endif
......
......@@ -21,25 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <malloc.h> // for alloca
#endif
<<<<<<< HEAD
#include <stdint.h>
#include <mediastreamer2/msfilter.h>
#include <ortp/payloadtype.h>
#include "g722.h"
#define TYPE(val) .type=(val)
#define CLOCK_RATE(val) .clock_rate=(val)
#define BITS_PER_SAMPLE(val) .bits_per_sample=(val)
#define ZERO_PATTERN(val) .zero_pattern=(val)
#define PATTERN_LENGTH(val) .pattern_length=(val)
#define NORMAL_BITRATE(val) .normal_bitrate=(val)
#define MIME_TYPE(val) .mime_type=(val)
#define CHANNELS(val) .channels=(val)
#define FMTP(val) .FMTP=(val)
struct EncState {
struct g722_encode_state *state;
=======
#include <mediastreamer2/msfilter.h>
......@@ -53,7 +34,6 @@ struct EncState {
struct EncState {
g722_encode_state_t *state;
>>>>>>> origin/master
uint32_t ts;
int ptime;
MSBufferizer *bufferizer;
......@@ -113,33 +93,22 @@ static void enc_process(MSFilter *f)
}
};
<<<<<<< HEAD
=======
static void set_ptime(struct EncState *s, int value){
if (value>0 && value<=100){
s->ptime=value;
}
}
>>>>>>> origin/master
static int enc_add_attr(MSFilter *f, void *arg)
{
const char *fmtp=(const char*)arg;
struct EncState *s=(struct EncState*)f->data;
if(strstr(fmtp,"ptime:"))
<<<<<<< HEAD
s->ptime = atoi(fmtp+6);
=======
set_ptime(s,atoi(fmtp+6));
>>>>>>> origin/master
return 0;
};
<<<<<<< HEAD
static MSFilterMethod enc_methods[]={
{ MS_FILTER_ADD_ATTR , enc_add_attr},
=======
static int enc_add_fmtp(MSFilter *f, void *arg){
const char *fmtp=(const char*)arg;
struct EncState *s=(struct EncState*)f->data;
......@@ -153,7 +122,6 @@ static int enc_add_fmtp(MSFilter *f, void *arg){
static MSFilterMethod enc_methods[]={
{ MS_FILTER_ADD_ATTR , enc_add_attr},
{ MS_FILTER_ADD_FMTP , enc_add_fmtp},
>>>>>>> origin/master
{ 0 , NULL }
};
......@@ -193,11 +161,7 @@ MSFilterDesc ms_g722_enc_desc={
#endif
struct DecState {
<<<<<<< HEAD
struct g722_decode_state *state;
=======
g722_decode_state_t *state;
>>>>>>> origin/master
};
static void dec_init(MSFilter *f){
......
......@@ -57,13 +57,6 @@
#ifndef SHADERS_H
#define SHADERS_H
<<<<<<< HEAD
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
/* Shader Utilities */
GLint compileShader(GLuint *shader, GLenum type, const GLchar /*NSString*/ *file);
=======
#ifdef TARGET_OS_IPHONE
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
......@@ -74,7 +67,6 @@ GLint compileShader(GLuint *shader, GLenum type, const GLchar /*NSString*/ *file
/* Shader Utilities */
GLint compileShader(GLuint *shader, GLenum type, const char* sources);
>>>>>>> origin/master
GLint linkProgram(GLuint prog);
GLint validateProgram(GLuint prog);
void destroyShaders(GLuint vertShader, GLuint fragShader, GLuint prog);
......
/*
File: Shaders.m
Abstract: Shader utilities for compiling, linking and validating shaders.
It is important to check the result status.
Version: 1.0
Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Inc.
("Apple") in consideration of your agreement to the following terms, and your
use, installation, modification or redistribution of this Apple software
constitutes acceptance of these terms. If you do not agree with these terms,
please do not use, install, modify or redistribute this Apple software.
In consideration of your agreement to abide by the following terms, and subject
to these terms, Apple grants you a personal, non-exclusive license, under
Apple's copyrights in this original Apple software (the "Apple Software"), to
use, reproduce, modify and redistribute the Apple Software, with or without
modifications, in source and/or binary forms; provided that if you redistribute
the Apple Software in its entirety and without modifications, you must retain
this notice and the following text and disclaimers in all such redistributions
of the Apple Software.
Neither the name, trademarks, service marks or logos of Apple Inc. may be used
to endorse or promote products derived from the Apple Software without specific
prior written permission from Apple. Except as expressly stated in this notice,
no other rights or licenses, express or implied, are granted by Apple herein,
including but not limited to any patent rights that may be infringed by your
derivative works or by other works in which the Apple Software may be
incorporated.
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
COMBINATION WITH YOUR PRODUCTS.
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 2009 Apple Inc. All Rights Reserved.
*/
#import "shaders.h"
#include "mediastreamer2/mscommon.h"
/* Create and compile a shader from the provided source(s) */
GLint compileShader(GLuint *shader, GLenum type, const GLchar *sources)
{
GLint status;
/*
const GLchar *sources;
// get source code
sources = (GLchar *)[[NSString stringWithContentsOfFile:file encoding:NSUTF8StringEncoding error:nil] UTF8String];
*/
if (!sources)
{
ms_error("Failed to load vertex shader");
return 0;
}
*shader = glCreateShader(type); // create shader
glShaderSource(*shader, 1, &sources, 0); // set source code in the shader
glCompileShader(*shader); // compile shader
#if 1
GLint logLength;
glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0)
{
GLchar *log = (GLchar *)malloc(logLength);
glGetShaderInfoLog(*shader, logLength, &logLength, log);
ms_debug("Shader compile log:\n%s", log);
free(log);
}
#endif
glGetShaderiv(*shader, GL_COMPILE_STATUS, &status);
if (status == GL_FALSE)
{
ms_error("Failed to compile shader:\n");
}
return status;
}
/* Link a program with all currently attached shaders */
GLint linkProgram(GLuint prog)
{
GLint status;
glLinkProgram(prog);
#if defined(DEBUG)
GLint logLength;
glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0)
{
GLchar *log = (GLchar *)malloc(logLength);
glGetProgramInfoLog(prog, logLength, &logLength, log);
ms_debug("Program link log:\n%s", log);
free(log);
}
#endif
glGetProgramiv(prog, GL_LINK_STATUS, &status);
if (status == GL_FALSE)
ms_error("Failed to link program %d", prog);
return status;
}
/* Validate a program (for i.e. inconsistent samplers) */
GLint validateProgram(GLuint prog)
{
GLint logLength, status;
glValidateProgram(prog);
glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0)
{
GLchar *log = (GLchar *)malloc(logLength);
glGetProgramInfoLog(prog, logLength, &logLength, log);
ms_debug("Program validate log:\n%s", log);
free(log);
}
glGetProgramiv(prog, GL_VALIDATE_STATUS, &status);
if (status == GL_FALSE)
ms_error("Failed to validate program %d", prog);
return status;
}
/* delete shader resources */
void destroyShaders(GLuint vertShader, GLuint fragShader, GLuint prog)
{
if (vertShader) {
glDeleteShader(vertShader);
vertShader = 0;
}
if (fragShader) {
glDeleteShader(fragShader);
fragShader = 0;
}
if (prog) {
glDeleteProgram(prog);
prog = 0;
}
}
......@@ -687,12 +687,10 @@ void video_stream_send_only_stop(VideoStream *vs){
video_stream_stop(vs);
}
#ifndef TARGET_OS_IPHONE
/* enable ZRTP on the video stream using information from the audio stream */
void video_stream_enable_zrtp(VideoStream *vstream, AudioStream *astream, OrtpZrtpParams *param){
if (astream->ortpZrtpContext != NULL) {
vstream->ortpZrtpContext=ortp_zrtp_multistream_new(astream->ortpZrtpContext, vstream->session, param);
}
}
#endif
......@@ -19,9 +19,5 @@
"b = clamp(y + 2.018 * u, 0.0, 1.0);\n" \
"\n" \
"gl_FragColor = vec4(r,g,b,1.0);\n" \
<<<<<<< HEAD
"}\n"
=======
"}\n"
>>>>>>> origin/master
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