Skip to content

Commit 37a3433

Browse files
author
James Dong
committedJun 15, 2009
Don't ignore compiler warnings (bug fix: 1315153)
1 parent 734bbb4 commit 37a3433

File tree

2 files changed

+50
-87
lines changed

2 files changed

+50
-87
lines changed
 

‎android/author/android_audio_input.cpp

+41-41
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ AndroidAudioInput::~AndroidAudioInput()
119119
}
120120

121121
////////////////////////////////////////////////////////////////////////////
122-
OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::connect(PvmiMIOSession& aSession, PvmiMIOObserver* aObserver)
122+
PVMFStatus AndroidAudioInput::connect(PvmiMIOSession& aSession, PvmiMIOObserver* aObserver)
123123
{
124124
LOGV("connect");
125125

@@ -137,7 +137,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::connect(PvmiMIOSession& aSession,
137137
}
138138

139139
////////////////////////////////////////////////////////////////////////////
140-
OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::disconnect(PvmiMIOSession aSession)
140+
PVMFStatus AndroidAudioInput::disconnect(PvmiMIOSession aSession)
141141
{
142142
LOGV("disconnect");
143143
uint32 index = (uint32)aSession;
@@ -152,7 +152,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::disconnect(PvmiMIOSession aSession
152152
}
153153

154154
////////////////////////////////////////////////////////////////////////////
155-
OSCL_EXPORT_REF PvmiMediaTransfer* AndroidAudioInput::createMediaTransfer(PvmiMIOSession& aSession,
155+
PvmiMediaTransfer* AndroidAudioInput::createMediaTransfer(PvmiMIOSession& aSession,
156156
PvmiKvp* read_formats,
157157
int32 read_flags,
158158
PvmiKvp* write_formats,
@@ -179,7 +179,7 @@ OSCL_EXPORT_REF PvmiMediaTransfer* AndroidAudioInput::createMediaTransfer(PvmiMI
179179
}
180180

181181
////////////////////////////////////////////////////////////////////////////
182-
OSCL_EXPORT_REF void AndroidAudioInput::deleteMediaTransfer(PvmiMIOSession& aSession,
182+
void AndroidAudioInput::deleteMediaTransfer(PvmiMIOSession& aSession,
183183
PvmiMediaTransfer* media_transfer)
184184
{
185185
LOGV("deleteMediaTransfer %p", this);
@@ -193,7 +193,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::deleteMediaTransfer(PvmiMIOSession& aSes
193193
}
194194

195195
////////////////////////////////////////////////////////////////////////////
196-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::QueryUUID(const PvmfMimeString& aMimeType,
196+
PVMFCommandId AndroidAudioInput::QueryUUID(const PvmfMimeString& aMimeType,
197197
Oscl_Vector<PVUuid, OsclMemAllocator>& aUuids,
198198
bool aExactUuidsOnly,
199199
const OsclAny* aContext)
@@ -209,7 +209,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::QueryUUID(const PvmfMimeString&
209209
}
210210

211211
////////////////////////////////////////////////////////////////////////////
212-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::QueryInterface(const PVUuid& aUuid,
212+
PVMFCommandId AndroidAudioInput::QueryInterface(const PVUuid& aUuid,
213213
PVInterface*& aInterfacePtr,
214214
const OsclAny* aContext)
215215
{
@@ -227,7 +227,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::QueryInterface(const PVUuid& aU
227227
}
228228

229229
////////////////////////////////////////////////////////////////////////////
230-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Init(const OsclAny* aContext)
230+
PVMFCommandId AndroidAudioInput::Init(const OsclAny* aContext)
231231
{
232232
LOGV("Init");
233233
if(iState != STATE_IDLE)
@@ -242,7 +242,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Init(const OsclAny* aContext)
242242

243243

244244
////////////////////////////////////////////////////////////////////////////
245-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Start(const OsclAny* aContext)
245+
PVMFCommandId AndroidAudioInput::Start(const OsclAny* aContext)
246246
{
247247
LOGV("Start");
248248
if(iState != STATE_INITIALIZED && iState != STATE_PAUSED)
@@ -256,7 +256,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Start(const OsclAny* aContext)
256256
}
257257

258258
////////////////////////////////////////////////////////////////////////////
259-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Pause(const OsclAny* aContext)
259+
PVMFCommandId AndroidAudioInput::Pause(const OsclAny* aContext)
260260
{
261261
LOGV("Pause");
262262
if(iState != STATE_STARTED)
@@ -270,7 +270,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Pause(const OsclAny* aContext)
270270
}
271271

272272
////////////////////////////////////////////////////////////////////////////
273-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Flush(const OsclAny* aContext)
273+
PVMFCommandId AndroidAudioInput::Flush(const OsclAny* aContext)
274274
{
275275
LOGV("Flush");
276276
if(iState != STATE_STARTED || iState != STATE_PAUSED)
@@ -284,22 +284,22 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Flush(const OsclAny* aContext)
284284
}
285285

286286
////////////////////////////////////////////////////////////////////////////
287-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Reset(const OsclAny* aContext)
287+
PVMFCommandId AndroidAudioInput::Reset(const OsclAny* aContext)
288288
{
289289
LOGV("Reset");
290290
return AddCmdToQueue(AI_CMD_RESET, aContext);
291291
}
292292

293293
////////////////////////////////////////////////////////////////////////////
294-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::DiscardData(PVMFTimestamp aTimestamp, const OsclAny* aContext)
294+
PVMFCommandId AndroidAudioInput::DiscardData(PVMFTimestamp aTimestamp, const OsclAny* aContext)
295295
{
296296
OSCL_UNUSED_ARG(aContext);
297297
OSCL_UNUSED_ARG(aTimestamp);
298298
OSCL_LEAVE(OsclErrNotSupported);
299299
return -1;
300300
}
301301

302-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::DiscardData(const OsclAny* aContext)
302+
PVMFCommandId AndroidAudioInput::DiscardData(const OsclAny* aContext)
303303
{
304304
OSCL_UNUSED_ARG(aContext);
305305
OSCL_LEAVE(OsclErrNotSupported);
@@ -308,7 +308,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::DiscardData(const OsclAny* aCon
308308

309309

310310
////////////////////////////////////////////////////////////////////////////
311-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Stop(const OsclAny* aContext)
311+
PVMFCommandId AndroidAudioInput::Stop(const OsclAny* aContext)
312312
{
313313
LOGV("Stop %p", this);
314314
if(iState != STATE_STARTED && iState != STATE_PAUSED)
@@ -322,7 +322,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::Stop(const OsclAny* aContext)
322322
}
323323

324324
////////////////////////////////////////////////////////////////////////////
325-
OSCL_EXPORT_REF void AndroidAudioInput::ThreadLogon()
325+
void AndroidAudioInput::ThreadLogon()
326326
{
327327
LOGV("ThreadLogon %p", this);
328328
if(!iThreadLoggedOn)
@@ -333,7 +333,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::ThreadLogon()
333333
}
334334

335335
////////////////////////////////////////////////////////////////////////////
336-
OSCL_EXPORT_REF void AndroidAudioInput::ThreadLogoff()
336+
void AndroidAudioInput::ThreadLogoff()
337337
{
338338
LOGV("ThreadLogoff");
339339
if(iThreadLoggedOn)
@@ -344,15 +344,15 @@ OSCL_EXPORT_REF void AndroidAudioInput::ThreadLogoff()
344344
}
345345

346346
////////////////////////////////////////////////////////////////////////////
347-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::CancelAllCommands( const OsclAny* aContext)
347+
PVMFCommandId AndroidAudioInput::CancelAllCommands( const OsclAny* aContext)
348348
{
349349
OSCL_UNUSED_ARG(aContext);
350350
OSCL_LEAVE(OsclErrNotSupported);
351351
return -1;
352352
}
353353

354354
////////////////////////////////////////////////////////////////////////////
355-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::CancelCommand( PVMFCommandId aCmdId, const OsclAny* aContext)
355+
PVMFCommandId AndroidAudioInput::CancelCommand( PVMFCommandId aCmdId, const OsclAny* aContext)
356356
{
357357
OSCL_UNUSED_ARG(aCmdId);
358358
OSCL_UNUSED_ARG(aContext);
@@ -361,7 +361,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::CancelCommand( PVMFCommandId aC
361361
}
362362

363363
////////////////////////////////////////////////////////////////////////////
364-
OSCL_EXPORT_REF void AndroidAudioInput::setPeer(PvmiMediaTransfer* aPeer)
364+
void AndroidAudioInput::setPeer(PvmiMediaTransfer* aPeer)
365365
{
366366
LOGV("setPeer");
367367
if(iPeer && aPeer)
@@ -374,14 +374,14 @@ OSCL_EXPORT_REF void AndroidAudioInput::setPeer(PvmiMediaTransfer* aPeer)
374374
}
375375

376376
////////////////////////////////////////////////////////////////////////////
377-
OSCL_EXPORT_REF void AndroidAudioInput::useMemoryAllocators(OsclMemAllocator* write_alloc)
377+
void AndroidAudioInput::useMemoryAllocators(OsclMemAllocator* write_alloc)
378378
{
379379
OSCL_UNUSED_ARG(write_alloc);
380380
OSCL_LEAVE(OsclErrNotSupported);
381381
}
382382

383383
////////////////////////////////////////////////////////////////////////////
384-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::writeAsync(uint8 aFormatType, int32 aFormatIndex,
384+
PVMFCommandId AndroidAudioInput::writeAsync(uint8 aFormatType, int32 aFormatIndex,
385385
uint8* aData, uint32 aDataLen,
386386
const PvmiMediaXferHeader& data_header_info,
387387
OsclAny* aContext)
@@ -398,7 +398,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::writeAsync(uint8 aFormatType, i
398398
}
399399

400400
////////////////////////////////////////////////////////////////////////////
401-
OSCL_EXPORT_REF void AndroidAudioInput::writeComplete(PVMFStatus aStatus, PVMFCommandId write_cmd_id,
401+
void AndroidAudioInput::writeComplete(PVMFStatus aStatus, PVMFCommandId write_cmd_id,
402402
OsclAny* aContext)
403403
{
404404
LOGV("writeComplete(%d, %p)", write_cmd_id, aContext);
@@ -434,7 +434,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::writeComplete(PVMFStatus aStatus, PVMFCo
434434
}
435435

436436
////////////////////////////////////////////////////////////////////////////
437-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::readAsync(uint8* data, uint32 max_data_len,
437+
PVMFCommandId AndroidAudioInput::readAsync(uint8* data, uint32 max_data_len,
438438
OsclAny* aContext, int32* formats, uint16 num_formats)
439439
{
440440
OSCL_UNUSED_ARG(data);
@@ -448,7 +448,7 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::readAsync(uint8* data, uint32 m
448448
}
449449

450450
////////////////////////////////////////////////////////////////////////////
451-
OSCL_EXPORT_REF void AndroidAudioInput::readComplete(PVMFStatus aStatus, PVMFCommandId read_cmd_id,
451+
void AndroidAudioInput::readComplete(PVMFStatus aStatus, PVMFCommandId read_cmd_id,
452452
int32 format_index, const PvmiMediaXferHeader& data_header_info,
453453
OsclAny* aContext)
454454
{
@@ -463,7 +463,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::readComplete(PVMFStatus aStatus, PVMFCom
463463
}
464464

465465
////////////////////////////////////////////////////////////////////////////
466-
OSCL_EXPORT_REF void AndroidAudioInput::statusUpdate(uint32 status_flags)
466+
void AndroidAudioInput::statusUpdate(uint32 status_flags)
467467
{
468468
OSCL_UNUSED_ARG(status_flags);
469469
// Ideally this routine should update the status of media input component.
@@ -477,7 +477,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::statusUpdate(uint32 status_flags)
477477

478478

479479
////////////////////////////////////////////////////////////////////////////
480-
OSCL_EXPORT_REF void AndroidAudioInput::cancelCommand(PVMFCommandId aCmdId)
480+
void AndroidAudioInput::cancelCommand(PVMFCommandId aCmdId)
481481
{
482482
OSCL_UNUSED_ARG(aCmdId);
483483
// This cancel command ( with a small "c" in cancel ) is for the media transfer interface.
@@ -486,19 +486,19 @@ OSCL_EXPORT_REF void AndroidAudioInput::cancelCommand(PVMFCommandId aCmdId)
486486
}
487487

488488
////////////////////////////////////////////////////////////////////////////
489-
OSCL_EXPORT_REF void AndroidAudioInput::cancelAllCommands()
489+
void AndroidAudioInput::cancelAllCommands()
490490
{
491491
OSCL_LEAVE(OsclErrNotSupported);
492492
}
493493

494494
////////////////////////////////////////////////////////////////////////////
495-
OSCL_EXPORT_REF void AndroidAudioInput::setObserver(PvmiConfigAndCapabilityCmdObserver* aObserver)
495+
void AndroidAudioInput::setObserver(PvmiConfigAndCapabilityCmdObserver* aObserver)
496496
{
497497
OSCL_UNUSED_ARG(aObserver);
498498
}
499499

500500
////////////////////////////////////////////////////////////////////////////
501-
OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession session,
501+
PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession session,
502502
PvmiKeyType identifier,
503503
PvmiKvp*& parameters,
504504
int& num_parameter_elements,
@@ -516,7 +516,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession s
516516
pv_mime_strcmp(identifier, OUTPUT_FORMATS_CUR_QUERY) == 0)
517517
{
518518
num_parameter_elements = 1;
519-
status = AllocateKvp(parameters, OUTPUT_FORMATS_VALTYPE, num_parameter_elements);
519+
status = AllocateKvp(parameters, (PvmiKeyType)OUTPUT_FORMATS_VALTYPE, num_parameter_elements);
520520
if(status != PVMFSuccess)
521521
{
522522
LOGE("AndroidAudioInput::getParametersSync() OUTPUT_FORMATS_VALTYPE AllocateKvp failed");
@@ -528,7 +528,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession s
528528
else if(pv_mime_strcmp(identifier, OUTPUT_TIMESCALE_CUR_QUERY) == 0)
529529
{
530530
num_parameter_elements = 1;
531-
status = AllocateKvp(parameters, OUTPUT_TIMESCALE_CUR_VALUE, num_parameter_elements);
531+
status = AllocateKvp(parameters, (PvmiKeyType)OUTPUT_TIMESCALE_CUR_VALUE, num_parameter_elements);
532532
if(status != PVMFSuccess)
533533
{
534534
LOGE("AndroidAudioInput::getParametersSync() OUTPUT_TIMESCALE_CUR_VALUE AllocateKvp failed");
@@ -567,7 +567,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession s
567567
}
568568

569569
////////////////////////////////////////////////////////////////////////////
570-
OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::releaseParameters(PvmiMIOSession session,
570+
PVMFStatus AndroidAudioInput::releaseParameters(PvmiMIOSession session,
571571
PvmiKvp* parameters,
572572
int num_elements)
573573
{
@@ -586,14 +586,14 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::releaseParameters(PvmiMIOSession s
586586
}
587587

588588
////////////////////////////////////////////////////////////////////////////
589-
OSCL_EXPORT_REF void AndroidAudioInput::createContext(PvmiMIOSession session, PvmiCapabilityContext& context)
589+
void AndroidAudioInput::createContext(PvmiMIOSession session, PvmiCapabilityContext& context)
590590
{
591591
OSCL_UNUSED_ARG(session);
592592
OSCL_UNUSED_ARG(context);
593593
}
594594

595595
////////////////////////////////////////////////////////////////////////////
596-
OSCL_EXPORT_REF void AndroidAudioInput::setContextParameters(PvmiMIOSession session,
596+
void AndroidAudioInput::setContextParameters(PvmiMIOSession session,
597597
PvmiCapabilityContext& context,
598598
PvmiKvp* parameters, int num_parameter_elements)
599599
{
@@ -604,14 +604,14 @@ OSCL_EXPORT_REF void AndroidAudioInput::setContextParameters(PvmiMIOSession sess
604604
}
605605

606606
////////////////////////////////////////////////////////////////////////////
607-
OSCL_EXPORT_REF void AndroidAudioInput::DeleteContext(PvmiMIOSession session, PvmiCapabilityContext& context)
607+
void AndroidAudioInput::DeleteContext(PvmiMIOSession session, PvmiCapabilityContext& context)
608608
{
609609
OSCL_UNUSED_ARG(session);
610610
OSCL_UNUSED_ARG(context);
611611
}
612612

613613
////////////////////////////////////////////////////////////////////////////
614-
OSCL_EXPORT_REF void AndroidAudioInput::setParametersSync(PvmiMIOSession session, PvmiKvp* parameters,
614+
void AndroidAudioInput::setParametersSync(PvmiMIOSession session, PvmiKvp* parameters,
615615
int num_elements, PvmiKvp*& ret_kvp)
616616
{
617617
LOGV("setParametersSync");
@@ -632,7 +632,7 @@ OSCL_EXPORT_REF void AndroidAudioInput::setParametersSync(PvmiMIOSession session
632632
}
633633

634634
////////////////////////////////////////////////////////////////////////////
635-
OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::setParametersAsync(PvmiMIOSession session,
635+
PVMFCommandId AndroidAudioInput::setParametersAsync(PvmiMIOSession session,
636636
PvmiKvp* parameters,
637637
int num_elements,
638638
PvmiKvp*& ret_kvp,
@@ -648,14 +648,14 @@ OSCL_EXPORT_REF PVMFCommandId AndroidAudioInput::setParametersAsync(PvmiMIOSessi
648648
}
649649

650650
////////////////////////////////////////////////////////////////////////////
651-
OSCL_EXPORT_REF uint32 AndroidAudioInput::getCapabilityMetric (PvmiMIOSession session)
651+
uint32 AndroidAudioInput::getCapabilityMetric (PvmiMIOSession session)
652652
{
653653
OSCL_UNUSED_ARG(session);
654654
return 0;
655655
}
656656

657657
////////////////////////////////////////////////////////////////////////////
658-
OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::verifyParametersSync(PvmiMIOSession session,
658+
PVMFStatus AndroidAudioInput::verifyParametersSync(PvmiMIOSession session,
659659
PvmiKvp* parameters, int num_elements)
660660
{
661661
OSCL_UNUSED_ARG(session);
@@ -665,7 +665,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::verifyParametersSync(PvmiMIOSessio
665665
}
666666

667667
////////////////////////////////////////////////////////////////////////////
668-
OSCL_EXPORT_REF bool AndroidAudioInput::setAudioSamplingRate(int32 iSamplingRate)
668+
bool AndroidAudioInput::setAudioSamplingRate(int32 iSamplingRate)
669669
{
670670
LOGV("AndroidAudioInput::setAudioSamplingRate( %d )", iSamplingRate);
671671

@@ -681,7 +681,7 @@ OSCL_EXPORT_REF bool AndroidAudioInput::setAudioSamplingRate(int32 iSamplingRate
681681
return true;
682682
}
683683
////////////////////////////////////////////////////////////////////////////
684-
OSCL_EXPORT_REF bool AndroidAudioInput::setAudioNumChannels(int32 iNumChannels)
684+
bool AndroidAudioInput::setAudioNumChannels(int32 iNumChannels)
685685
{
686686
LOGV("AndroidAudioInput::setAudioNumChannels( %d )", iNumChannels);
687687

‎android/author/android_camera_input.cpp

+9-46
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ AndroidCameraInput::~AndroidCameraInput()
109109
iFrameQueueMutex.Close();
110110
}
111111

112-
OSCL_EXPORT_REF
113112
PVMFStatus AndroidCameraInput::connect(PvmiMIOSession& aSession,
114113
PvmiMIOObserver* aObserver)
115114
{
@@ -129,7 +128,6 @@ PVMFStatus AndroidCameraInput::connect(PvmiMIOSession& aSession,
129128
return PVMFSuccess;
130129
}
131130

132-
OSCL_EXPORT_REF
133131
PVMFStatus AndroidCameraInput::disconnect(PvmiMIOSession aSession)
134132
{
135133
LOGV("disconnect");
@@ -144,7 +142,6 @@ PVMFStatus AndroidCameraInput::disconnect(PvmiMIOSession aSession)
144142
return PVMFSuccess;
145143
}
146144

147-
OSCL_EXPORT_REF
148145
PvmiMediaTransfer* AndroidCameraInput::createMediaTransfer(
149146
PvmiMIOSession& aSession,
150147
PvmiKvp* read_formats,
@@ -169,7 +166,6 @@ PvmiMediaTransfer* AndroidCameraInput::createMediaTransfer(
169166
return (PvmiMediaTransfer*)this;
170167
}
171168

172-
OSCL_EXPORT_REF
173169
void AndroidCameraInput::deleteMediaTransfer(PvmiMIOSession& aSession,
174170
PvmiMediaTransfer* media_transfer)
175171
{
@@ -193,7 +189,6 @@ void AndroidCameraInput::deleteMediaTransfer(PvmiMIOSession& aSession,
193189
// is any outstanding buffer?
194190
}
195191

196-
OSCL_EXPORT_REF
197192
PVMFCommandId AndroidCameraInput::QueryUUID(const PvmfMimeString& aMimeType,
198193
Oscl_Vector<PVUuid,
199194
OsclMemAllocator>& aUuids,
@@ -212,7 +207,6 @@ PVMFCommandId AndroidCameraInput::QueryUUID(const PvmfMimeString& aMimeType,
212207
return AddCmdToQueue(CMD_QUERY_UUID, aContext);
213208
}
214209

215-
OSCL_EXPORT_REF
216210
PVMFCommandId AndroidCameraInput::QueryInterface(const PVUuid& aUuid,
217211
PVInterface*& aInterfacePtr,
218212
const OsclAny* aContext)
@@ -232,7 +226,6 @@ PVMFCommandId AndroidCameraInput::QueryInterface(const PVUuid& aUuid,
232226
(OsclAny*)&aInterfacePtr);
233227
}
234228

235-
OSCL_EXPORT_REF
236229
PVMFCommandId AndroidCameraInput::Init(const OsclAny* aContext)
237230
{
238231
LOGV("Init");
@@ -246,7 +239,6 @@ PVMFCommandId AndroidCameraInput::Init(const OsclAny* aContext)
246239
}
247240

248241

249-
OSCL_EXPORT_REF
250242
PVMFCommandId AndroidCameraInput::Start(const OsclAny* aContext)
251243
{
252244
LOGV("Start");
@@ -259,7 +251,6 @@ PVMFCommandId AndroidCameraInput::Start(const OsclAny* aContext)
259251
return AddCmdToQueue(CMD_START, aContext);
260252
}
261253

262-
OSCL_EXPORT_REF
263254
PVMFCommandId AndroidCameraInput::Pause(const OsclAny* aContext)
264255
{
265256
LOGV("Pause");
@@ -272,7 +263,6 @@ PVMFCommandId AndroidCameraInput::Pause(const OsclAny* aContext)
272263
return AddCmdToQueue(CMD_PAUSE, aContext);
273264
}
274265

275-
OSCL_EXPORT_REF
276266
PVMFCommandId AndroidCameraInput::Flush(const OsclAny* aContext)
277267
{
278268
LOGV("Flush");
@@ -285,14 +275,12 @@ PVMFCommandId AndroidCameraInput::Flush(const OsclAny* aContext)
285275
return AddCmdToQueue(CMD_FLUSH, aContext);
286276
}
287277

288-
OSCL_EXPORT_REF
289278
PVMFCommandId AndroidCameraInput::Reset(const OsclAny* aContext)
290279
{
291280
LOGV("Reset");
292281
return AddCmdToQueue(CMD_RESET, aContext);
293282
}
294283

295-
OSCL_EXPORT_REF
296284
PVMFCommandId AndroidCameraInput::DiscardData(PVMFTimestamp aTimestamp,
297285
const OsclAny* aContext)
298286
{
@@ -303,7 +291,6 @@ PVMFCommandId AndroidCameraInput::DiscardData(PVMFTimestamp aTimestamp,
303291
return -1;
304292
}
305293

306-
OSCL_EXPORT_REF
307294
PVMFCommandId AndroidCameraInput::DiscardData(const OsclAny* aContext)
308295
{
309296
LOGV("DiscardData");
@@ -312,7 +299,6 @@ PVMFCommandId AndroidCameraInput::DiscardData(const OsclAny* aContext)
312299
return -1;
313300
}
314301

315-
OSCL_EXPORT_REF
316302
PVMFCommandId AndroidCameraInput::Stop(const OsclAny* aContext)
317303
{
318304
LOGV("Stop");
@@ -325,7 +311,6 @@ PVMFCommandId AndroidCameraInput::Stop(const OsclAny* aContext)
325311
return AddCmdToQueue(CMD_STOP, aContext);
326312
}
327313

328-
OSCL_EXPORT_REF
329314
void AndroidCameraInput::ThreadLogon()
330315
{
331316
LOGV("ThreadLogon");
@@ -335,7 +320,6 @@ void AndroidCameraInput::ThreadLogon()
335320
}
336321
}
337322

338-
OSCL_EXPORT_REF
339323
void AndroidCameraInput::ThreadLogoff()
340324
{
341325
LOGV("ThreadLogoff");
@@ -345,7 +329,6 @@ void AndroidCameraInput::ThreadLogoff()
345329
}
346330
}
347331

348-
OSCL_EXPORT_REF
349332
PVMFCommandId AndroidCameraInput::CancelAllCommands(const OsclAny* aContext)
350333
{
351334
LOGV("CancelAllCommands");
@@ -354,7 +337,6 @@ PVMFCommandId AndroidCameraInput::CancelAllCommands(const OsclAny* aContext)
354337
return -1;
355338
}
356339

357-
OSCL_EXPORT_REF
358340
PVMFCommandId AndroidCameraInput::CancelCommand(PVMFCommandId aCmdId,
359341
const OsclAny* aContext)
360342
{
@@ -365,28 +347,25 @@ PVMFCommandId AndroidCameraInput::CancelCommand(PVMFCommandId aCmdId,
365347
return -1;
366348
}
367349

368-
OSCL_EXPORT_REF
369350
void AndroidCameraInput::setPeer(PvmiMediaTransfer* aPeer)
370351
{
371-
LOGV("setPeer iPeer 0x%x aPeer 0x%x", iPeer, aPeer);
352+
LOGV("setPeer iPeer %p aPeer %p", iPeer, aPeer);
372353
if(iPeer && aPeer){
373-
LOGE("setPeer iPeer 0x%x aPeer 0x%x", iPeer, aPeer);
354+
LOGE("setPeer iPeer %p aPeer %p", iPeer, aPeer);
374355
OSCL_LEAVE(OsclErrGeneral);
375356
return;
376357
}
377358

378359
iPeer = aPeer;
379360
}
380361

381-
OSCL_EXPORT_REF
382362
void AndroidCameraInput::useMemoryAllocators(OsclMemAllocator* write_alloc)
383363
{
384364
LOGV("useMemoryAllocators");
385365
OSCL_UNUSED_ARG(write_alloc);
386366
OSCL_LEAVE(OsclErrNotSupported);
387367
}
388368

389-
OSCL_EXPORT_REF
390369
PVMFCommandId AndroidCameraInput::writeAsync(uint8 aFormatType,
391370
int32 aFormatIndex,
392371
uint8* aData,
@@ -406,7 +385,6 @@ PVMFCommandId AndroidCameraInput::writeAsync(uint8 aFormatType,
406385
return -1;
407386
}
408387

409-
OSCL_EXPORT_REF
410388
void AndroidCameraInput::writeComplete(PVMFStatus aStatus,
411389
PVMFCommandId write_cmd_id,
412390
OsclAny* aContext)
@@ -449,7 +427,6 @@ void AndroidCameraInput::writeComplete(PVMFStatus aStatus,
449427
}
450428
}
451429

452-
OSCL_EXPORT_REF
453430
PVMFCommandId AndroidCameraInput::readAsync(uint8* data,
454431
uint32 max_data_len,
455432
OsclAny* aContext,
@@ -467,7 +444,6 @@ PVMFCommandId AndroidCameraInput::readAsync(uint8* data,
467444
return -1;
468445
}
469446

470-
OSCL_EXPORT_REF
471447
void AndroidCameraInput::readComplete(PVMFStatus aStatus,
472448
PVMFCommandId read_cmd_id,
473449
int32 format_index,
@@ -485,7 +461,6 @@ void AndroidCameraInput::readComplete(PVMFStatus aStatus,
485461
return;
486462
}
487463

488-
OSCL_EXPORT_REF
489464
void AndroidCameraInput::statusUpdate(uint32 status_flags)
490465
{
491466
LOGV("statusUpdate");
@@ -499,7 +474,6 @@ void AndroidCameraInput::statusUpdate(uint32 status_flags)
499474
OSCL_LEAVE(OsclErrNotSupported);
500475
}
501476

502-
OSCL_EXPORT_REF
503477
void AndroidCameraInput::cancelCommand(PVMFCommandId aCmdId)
504478
{
505479
LOGV("cancelCommand");
@@ -511,22 +485,19 @@ void AndroidCameraInput::cancelCommand(PVMFCommandId aCmdId)
511485
OSCL_LEAVE(OsclErrNotSupported);
512486
}
513487

514-
OSCL_EXPORT_REF
515488
void AndroidCameraInput::cancelAllCommands()
516489
{
517490
LOGV("cancelAllCommands");
518491
OSCL_LEAVE(OsclErrNotSupported);
519492
}
520493

521-
OSCL_EXPORT_REF
522494
void AndroidCameraInput::setObserver(
523495
PvmiConfigAndCapabilityCmdObserver* aObserver)
524496
{
525497
LOGV("setObserver");
526498
OSCL_UNUSED_ARG(aObserver);
527499
}
528500

529-
OSCL_EXPORT_REF
530501
PVMFStatus AndroidCameraInput::getParametersSync(PvmiMIOSession session,
531502
PvmiKeyType identifier,
532503
PvmiKvp*& params,
@@ -544,23 +515,23 @@ PVMFStatus AndroidCameraInput::getParametersSync(PvmiMIOSession session,
544515
if (!pv_mime_strcmp(identifier, OUTPUT_FORMATS_CAP_QUERY) ||
545516
!pv_mime_strcmp(identifier, OUTPUT_FORMATS_CUR_QUERY)) {
546517
num_params = 1;
547-
status = AllocateKvp(params, OUTPUT_FORMATS_VALTYPE, num_params);
518+
status = AllocateKvp(params, (PvmiKeyType)OUTPUT_FORMATS_VALTYPE, num_params);
548519
if (status != PVMFSuccess) {
549520
LOGE("AllocateKvp failed for OUTPUT_FORMATS_VALTYP");
550521
return status;
551522
}
552-
params[0].value.pChar_value = ANDROID_VIDEO_FORMAT;
523+
params[0].value.pChar_value = (char*)ANDROID_VIDEO_FORMAT;
553524
} else if (!pv_mime_strcmp(identifier, VIDEO_OUTPUT_WIDTH_CUR_QUERY)) {
554525
num_params = 1;
555-
status = AllocateKvp(params, VIDEO_OUTPUT_WIDTH_CUR_VALUE, num_params);
526+
status = AllocateKvp(params, (PvmiKeyType)VIDEO_OUTPUT_WIDTH_CUR_VALUE, num_params);
556527
if (status != PVMFSuccess) {
557528
LOGE("AllocateKvp failed for VIDEO_OUTPUT_WIDTH_CUR_VALUE");
558529
return status;
559530
}
560531
params[0].value.uint32_value = mFrameWidth;
561532
} else if (!pv_mime_strcmp(identifier, VIDEO_OUTPUT_HEIGHT_CUR_QUERY)) {
562533
num_params = 1;
563-
status = AllocateKvp(params, VIDEO_OUTPUT_HEIGHT_CUR_VALUE, num_params);
534+
status = AllocateKvp(params, (PvmiKeyType)VIDEO_OUTPUT_HEIGHT_CUR_VALUE, num_params);
564535
if (status != PVMFSuccess) {
565536
LOGE("AllocateKvp failed for VIDEO_OUTPUT_HEIGHT_CUR_VALUE");
566537
return status;
@@ -569,15 +540,15 @@ PVMFStatus AndroidCameraInput::getParametersSync(PvmiMIOSession session,
569540
} else if (!pv_mime_strcmp(identifier, VIDEO_OUTPUT_FRAME_RATE_CUR_QUERY)) {
570541
num_params = 1;
571542
status = AllocateKvp(params,
572-
VIDEO_OUTPUT_FRAME_RATE_CUR_VALUE, num_params);
543+
(PvmiKeyType)VIDEO_OUTPUT_FRAME_RATE_CUR_VALUE, num_params);
573544
if (status != PVMFSuccess) {
574545
LOGE("AllocateKvp failed for VIDEO_OUTPUT_FRAME_RATE_CUR_VALUE");
575546
return status;
576547
}
577548
params[0].value.float_value = mFrameRate;
578549
} else if (!pv_mime_strcmp(identifier, OUTPUT_TIMESCALE_CUR_QUERY)) {
579550
num_params = 1;
580-
status = AllocateKvp(params, OUTPUT_TIMESCALE_CUR_VALUE, num_params);
551+
status = AllocateKvp(params, (PvmiKeyType)OUTPUT_TIMESCALE_CUR_VALUE, num_params);
581552
if (status != PVMFSuccess) {
582553
LOGE("AllocateKvp failed for OUTPUT_TIMESCALE_CUR_VALUE");
583554
return status;
@@ -590,7 +561,6 @@ PVMFStatus AndroidCameraInput::getParametersSync(PvmiMIOSession session,
590561
return status;
591562
}
592563

593-
OSCL_EXPORT_REF
594564
PVMFStatus AndroidCameraInput::releaseParameters(PvmiMIOSession session,
595565
PvmiKvp* parameters,
596566
int num_elements)
@@ -607,7 +577,6 @@ PVMFStatus AndroidCameraInput::releaseParameters(PvmiMIOSession session,
607577
return PVMFSuccess;
608578
}
609579

610-
OSCL_EXPORT_REF
611580
void AndroidCameraInput::createContext(PvmiMIOSession session,
612581
PvmiCapabilityContext& context)
613582
{
@@ -616,7 +585,6 @@ void AndroidCameraInput::createContext(PvmiMIOSession session,
616585
OSCL_UNUSED_ARG(context);
617586
}
618587

619-
OSCL_EXPORT_REF
620588
void AndroidCameraInput::setContextParameters(PvmiMIOSession session,
621589
PvmiCapabilityContext& context,
622590
PvmiKvp* parameters,
@@ -629,7 +597,6 @@ void AndroidCameraInput::setContextParameters(PvmiMIOSession session,
629597
OSCL_UNUSED_ARG(num_parameter_elements);
630598
}
631599

632-
OSCL_EXPORT_REF
633600
void AndroidCameraInput::DeleteContext(PvmiMIOSession session,
634601
PvmiCapabilityContext& context)
635602
{
@@ -638,7 +605,6 @@ void AndroidCameraInput::DeleteContext(PvmiMIOSession session,
638605
OSCL_UNUSED_ARG(context);
639606
}
640607

641-
OSCL_EXPORT_REF
642608
void AndroidCameraInput::setParametersSync(PvmiMIOSession session,
643609
PvmiKvp* parameters,
644610
int num_elements,
@@ -659,7 +625,6 @@ void AndroidCameraInput::setParametersSync(PvmiMIOSession session,
659625
}
660626
}
661627

662-
OSCL_EXPORT_REF
663628
PVMFCommandId AndroidCameraInput::setParametersAsync(PvmiMIOSession session,
664629
PvmiKvp* parameters,
665630
int num_elements,
@@ -676,15 +641,13 @@ PVMFCommandId AndroidCameraInput::setParametersAsync(PvmiMIOSession session,
676641
return -1;
677642
}
678643

679-
OSCL_EXPORT_REF
680644
uint32 AndroidCameraInput::getCapabilityMetric (PvmiMIOSession session)
681645
{
682646
LOGV("getCapabilityMetric");
683647
OSCL_UNUSED_ARG(session);
684648
return 0;
685649
}
686650

687-
OSCL_EXPORT_REF
688651
PVMFStatus AndroidCameraInput::verifyParametersSync(PvmiMIOSession session,
689652
PvmiKvp* parameters,
690653
int num_elements)
@@ -753,7 +716,7 @@ void AndroidCameraInput::Run()
753716
data.iFrameSize, data.iXferHeader););
754717
} else {
755718
//FIXME Check why camera sends NULL frames
756-
LOGE("Ln %d ERROR null pointer");
719+
LOGE("Ln %d ERROR null pointer", __LINE__);
757720
error = OsclErrBadHandle;
758721
}
759722

0 commit comments

Comments
 (0)
Please sign in to comment.